ethagent 3.3.3 → 4.0.0

package/src/identity/{hub → manager}/ens/EnsEditAdvancedScreens.tsx

@@ -69,7 +69,7 @@ export function renderAdvancedEnsPhase({
     return (
       <Surface
         title="Checking ENS and Token Ownership"
-        subtitle={`Verifying the connected wallet manages ${phase.rootName} and owns the ERC-8004 token.`}
+        subtitle={`Verifying ${phase.rootName}.`}
         footer={footerHint('esc back')}
       >
         <Box marginTop={1}>
@@ -117,7 +117,7 @@ export function renderAdvancedEnsPhase({
     return (
       <Surface
         title="Check Agent Subdomain"
-        subtitle={`Verifying ${phase.label}.${phase.rootName} on Ethereum Mainnet.`}
+        subtitle={`Verifying ${phase.label}.${phase.rootName}.`}
         footer={footerHint('esc back')}
       >
         <Box marginTop={1}>

package/src/identity/{hub → manager}/ens/EnsEditMaintenanceScreens.tsx

@@ -78,15 +78,15 @@ export function renderEnsMaintenancePhase({
     const multiNeedsCustodySetup = isAdvanced && !savedOwnerAddress
     const subtitle = currentEnsName
       ? `This agent resolves at ${currentEnsName}.`
-      : 'Link an ENS name so others can find this agent by name instead of token ID.'
+      : 'Assign a name so others can find this agent.'
     const linkHint = multiNeedsCustodySetup
       ? 'Set Advanced custody first via Custody Mode'
       : isAdvanced
-        ? 'Root → Name → Review → Apply'
-        : 'Root → Name → Review → Apply'
+        ? 'Root → Name → Apply'
+        : 'Root → Name → 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 the name from the token. Link a different one anytime.' })
+      options.push({ value: 'unlink', label: 'Unlink Name' })
     } else {
       options.push({
         value: 'link',
@@ -95,8 +95,7 @@ export function renderEnsMaintenancePhase({
         disabled: multiNeedsCustodySetup,
       })
     }
-    options.push({ value: 'back', role: 'section', label: 'Navigation' })
-    options.push({ value: 'back', label: 'Back', hint: 'Return to Identity Hub', role: 'utility' })
+    options.push({ value: 'back', label: 'Back', role: 'utility' })
     return (
       <Surface
         title="ENS Name"
@@ -134,7 +133,7 @@ export function renderEnsMaintenancePhase({
         subtitle={`Reading ethagent records from ${phase.fullName}`}
         footer={footerHint('esc back')}
       >
-        <Spinner label="reading current ENS record values..." />
+        <Spinner label="reading ENS records..." />
         <EscCancel onCancel={() => setPhase({ kind: 'mode-select' })} />
       </Surface>
     )
@@ -167,7 +166,7 @@ export function renderEnsMaintenancePhase({
         subtitle={`Verifying the parent of ${phase.fullName} on Ethereum mainnet.`}
         footer={footerHint('esc back')}
       >
-        <Spinner label="reading parent owner from ENS..." />
+        <Spinner label="reading ENS owner..." />
         <EscCancel onCancel={() => setPhase({ kind: 'mode-select' })} />
       </Surface>
     )
@@ -186,8 +185,7 @@ export function renderEnsMaintenancePhase({
         <Box>
           <Select<'back'>
             options={[
-              { value: 'back', role: 'section', label: 'Navigation' },
-              { value: 'back', label: 'Back to ENS', hint: 'Return to ENS menu', role: 'utility' },
+              { value: 'back', label: 'Back to ENS', role: 'utility' },
             ]}
             hintLayout="inline"
             onSubmit={() => setPhase({ kind: 'mode-select' })}
@@ -203,7 +201,7 @@ export function renderEnsMaintenancePhase({
     return (
       <Surface
         title="Delete ENS Subdomain"
-        subtitle={`Clear the onchain entry for ${plan.fullName} at ${plan.parentName}.`}
+        subtitle={`Remove ${plan.fullName} from ${plan.parentName}.`}
         footer={footerHint('enter select · esc back')}
       >
         <Box flexDirection="column" marginBottom={1}>
@@ -214,18 +212,13 @@ export function renderEnsMaintenancePhase({
             label="Path"
             value={plan.parentWrapped ? 'NameWrapper.setSubnodeRecord' : 'Registry.setSubnodeRecord'}
           />
-          <EnsSetupRow
-            label="What changes"
-            value="Onchain: subdomain owner and resolver set to 0. Locally: this token unlinks from the name."
-          />
         </Box>
         <Box>
           <Select<'delete' | 'back'>
             options={[
               { value: 'delete', role: 'section', label: 'Action' },
-              { value: 'delete', label: 'Delete Subdomain', hint: 'Sign with the owner wallet to clear the onchain entry' },
-              { value: 'back', role: 'section', label: 'Navigation' },
-              { value: 'back', label: 'Back', hint: 'Return to ENS menu', role: 'utility' },
+              { value: 'delete', label: 'Delete Subdomain', hint: 'Owner wallet signs' },
+              { value: 'back', label: 'Back', role: 'utility' },
             ]}
             hintLayout="inline"
             onSubmit={choice => {
@@ -265,14 +258,10 @@ export function renderEnsMaintenancePhase({
         subtitle={`${phase.fullName} is cleared onchain and unlinked from this token.`}
         footer={footerHint('enter select · esc back')}
       >
-        <Box flexDirection="column" marginBottom={1}>
-          <Text color={theme.text}>The label is freed for reuse on the parent name.</Text>
-        </Box>
         <Box>
           <Select<'back'>
             options={[
-              { value: 'back', role: 'section', label: 'Navigation' },
-              { value: 'back', label: 'Back to ENS', hint: 'Return to ENS menu', role: 'utility' },
+              { value: 'back', label: 'Back to ENS', role: 'utility' },
             ]}
             hintLayout="inline"
             onSubmit={() => setPhase({ kind: 'mode-select' })}

package/src/identity/{hub → manager}/ens/EnsEditReviewScreens.tsx

@@ -72,11 +72,9 @@ export const SimpleEnsIssueScreen: React.FC<SimpleEnsIssueScreenProps> = ({
       <Box marginTop={1}>
         <Select<Action>
           options={[
-            { value: 'create', role: 'section', label: 'Create Subdomain' },
-            { value: 'create', label: 'Create This ENS Name', hint: 'Connected wallet creates it and sets the required records' },
-            { value: 'change', label: 'Pick A Different Name', hint: 'Return to subdomain entry with this name still filled in' },
-            { value: 'back', role: 'section', label: 'Navigation' },
-            { value: 'back', label: 'Back', hint: 'Return to subdomain entry', role: 'utility' },
+            { value: 'create', label: 'Create This ENS Name' },
+            { value: 'change', label: 'Pick A Different Name' },
+            { value: 'back', label: 'Back', role: 'utility' },
           ]}
           hintLayout="inline"
           onSubmit={choice => {
@@ -121,9 +119,6 @@ export const EnsSetupReviewScreen: React.FC<EnsSetupReviewScreenProps> = ({
       : setup.registryAction === 'set-wrapped-resolver'
         ? 'Set Wrapped Resolver'
         : 'Subdomain Ready'
-  const beginHint = setup.registryAction === 'none'
-    ? 'Ethereum Mainnet: subdomain already ready'
-    : 'Ethereum Mainnet: create or prepare subdomain'
   const reusingExistingSubdomain = setup.registryAction === 'none'
   return (
     <Surface
@@ -147,10 +142,8 @@ export const EnsSetupReviewScreen: React.FC<EnsSetupReviewScreenProps> = ({
       <Box marginTop={1}>
         <Select<Action>
           options={[
-            { value: 'begin', role: 'section', label: 'Subdomain' },
-            { value: 'begin', label: 'Continue Setup', hint: beginHint },
-            { value: 'back', role: 'section', label: 'Navigation' },
-            { value: 'back', label: 'Back', hint: isSimple ? 'Return to subdomain entry' : 'Return to operator wallet', role: 'utility' },
+            { value: 'begin', label: 'Continue Setup' },
+            { value: 'back', label: 'Back', role: 'utility' },
           ]}
           hintLayout="inline"
           onSubmit={choice => {
@@ -209,10 +202,8 @@ export const EnsSetupBlockedScreen: React.FC<EnsSetupBlockedScreenProps> = ({
       <Box marginTop={1}>
         <Select<Action>
           options={[
-            { value: 'check', role: 'section', label: 'Automation' },
-            { value: 'check', label: 'Check Again', hint: isSimple ? 'Re-run the simple ENS automation check' : 'Re-read ENS after the token is back with the owner wallet' },
-            { value: 'back', role: 'section', label: 'Navigation' },
-            { value: 'back', label: 'Back', hint: isSimple ? 'Return to subdomain entry' : 'Return to the previous setup step', role: 'utility' },
+            { value: 'check', label: 'Check Again' },
+            { value: 'back', label: 'Back', role: 'utility' },
           ]}
           hintLayout="inline"
           onSubmit={choice => {
@@ -254,13 +245,10 @@ export const UnlinkEnsReviewScreen: React.FC<UnlinkEnsReviewScreenProps> = ({
       <Box flexDirection="column">
         <EnsSetupRow label="ENS name" value={fullName} />
         <EnsSetupRow label="Custody" value={displayCustodyMode(currentMode)} />
-        <Text color={theme.dim}>
-          Records on Ethereum Mainnet, then token URI on {registryNetworkLabel}.
-        </Text>
         {recordsAlreadyEmpty ? (
           <Box marginTop={1}>
             <Text color={theme.dim}>
-              All ethagent ENS records are already empty. Unlink removes only the token URI link.
+              Removes the token URI link only.
             </Text>
           </Box>
         ) : (
@@ -278,16 +266,8 @@ export const UnlinkEnsReviewScreen: React.FC<UnlinkEnsReviewScreenProps> = ({
       <Box marginTop={1}>
         <Select<Action>
           options={[
-            { value: 'unlink', role: 'section', label: 'Unlink' },
-            {
-              value: 'unlink',
-              label: 'Unlink ENS',
-              hint: recordsAlreadyEmpty
-                ? 'Skip the records transaction and remove only the token URI link'
-                : 'Clear ethagent-owned records, then remove the token URI link',
-            },
-            { value: 'back', role: 'section', label: 'Navigation' },
-            { value: 'back', label: 'Back', hint: 'Return to ENS setup', role: 'utility' },
+            { value: 'unlink', label: 'Unlink ENS' },
+            { value: 'back', label: 'Back', role: 'utility' },
           ]}
           hintLayout="inline"
           onSubmit={choice => {
@@ -339,7 +319,7 @@ export const ReviewScreen: React.FC<ReviewScreenProps> = ({
   type ReviewAction = 'continue' | 'create' | 'check-again' | 'change' | 'back'
   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 reviewSubtitle = 'Review ENS records before linking.'
 
   if (!validation.ok) {
     const reason = ensValidationReasonText(validation.reason)
@@ -368,14 +348,12 @@ export const ReviewScreen: React.FC<ReviewScreenProps> = ({
             options={[
               ...(onCreate
                 ? [
-                    { value: 'create' as ReviewAction, role: 'section' as const, label: 'Create Subdomain' },
-                    { value: 'create' as ReviewAction, label: 'Create This ENS Name', hint: 'Use ethagent to create it and set the required records' },
+                    { value: 'create' as ReviewAction, label: 'Create This ENS Name' },
                   ]
                 : []),
-              { value: 'check-again', label: 'Check Again', hint: 'Re-verify on Ethereum mainnet' },
-              { 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 subdomain entry', role: 'utility' },
+              { value: 'check-again', label: 'Check Again' },
+              { value: 'change', label: 'Pick A Different Name' },
+              { value: 'back', label: 'Back', role: 'utility' },
             ]}
             hintLayout="inline"
             onSubmit={choice => {
@@ -392,11 +370,9 @@ 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} 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' },
+    { value: 'continue', label: 'Continue Setup' },
+    { value: 'change', label: 'Pick A Different Name' },
+    { value: 'back', label: 'Back', role: 'utility' },
   ]
 
   return (

package/src/identity/{hub → manager}/ens/EnsEditRunners.tsx

@@ -55,7 +55,7 @@ export const DeleteSubdomainTxRunner: React.FC<{
       title="Delete ENS Subdomain"
       subtitle={`Clearing the subnode for ${plan.fullName} at ${plan.parentName} on Ethereum mainnet.`}
       walletSession={walletSession}
-      label="waiting for owner wallet transaction..."
+      label="waiting for wallet to delete the subdomain..."
       onCancel={() => onError('Subdomain deletion cancelled.')}
     />
   )

package/src/identity/{hub → manager}/ens/EnsEditShared.tsx

@@ -133,8 +133,6 @@ export const SubdomainEntry: React.FC<SubdomainEntryProps> = ({ parent, ownerAdd
     title={`Subdomain of ${parent}`}
     footer={footerHint('enter continues · esc back')}
   >
-    <Text color={theme.dim}>Type the subdomain name that goes before .{parent}.</Text>
-    <Text color={theme.dim}>Use lowercase letters, digits, and hyphens.</Text>
     {error ? <Text color={theme.accentError}>{error}</Text> : null}
     <TextInput
       key={`edit-ens-subdomain-${parent}`}

package/src/identity/{hub → manager}/ens/EnsEditSimpleScreens.tsx

@@ -106,7 +106,7 @@ export function renderSimpleEnsPhase({
       >
         <Box marginTop={1}>
           <Spinner
-            label={`Looking up root ENS names for ${shortAddress(ownerAddress)}...`}
+            label="looking up ENS names..."
             startedAt={discoveryStartedAt}
           />
         </Box>
@@ -130,30 +130,25 @@ export function renderSimpleEnsPhase({
             ...ownedNames.map(name => ({
               value: `pick:${name}` as DomainAction,
               label: name,
-              hint: `Next, choose the subdomain under ${name}`,
+              hint: 'Choose a subdomain',
             })),
           ]
         : []),
-      { 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: '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' }]
-        : []),
+      { value: 'open-ens-domains' as DomainAction, label: 'Register .eth Name', hint: 'Opens the ENS app' },
       ...(discovery.status === 'error'
         ? [
-            { value: 'retry' as DomainAction, label: errorMessage ? 'Try Again' : 'Retry Lookup', hint: 'Retry root ENS name search' },
-            { value: 'manual' as DomainAction, label: 'Enter ENS Name Manually', hint: 'Lookup failed; type a root .eth name you own' },
+            { value: 'retry' as DomainAction, label: errorMessage ? 'Try Again' : 'Retry Lookup', hint: 'Retry lookup' },
+            { value: 'manual' as DomainAction, label: 'Enter ENS Name Manually' },
           ]
         : []),
-      { value: 'back', role: 'section', label: 'Navigation' },
-      { value: 'back', label: 'Back', hint: 'Return to setup type', role: 'utility' },
+      { value: 'back', label: 'Back', role: 'utility' },
     ]
 
     const advancedMode = phase.mode === 'advanced'
     return (
       <Surface
         title="Assign ENS Name"
-        subtitle="Choose a root .eth name, then create a dedicated agent subdomain under it."
+        subtitle="Choose a root .eth name to create an agent subdomain under."
         footer={footerHint('enter select · esc back')}
       >
         <EnsStatusBanner identity={identity} noRootEnsName={noOwnedNames} />
@@ -168,7 +163,7 @@ export function renderSimpleEnsPhase({
           ? (
               <Box marginTop={1} flexDirection="column">
                 <Text color={theme.dim}>This wallet does not own a parent <Text color={theme.text}>.eth</Text> name yet.</Text>
-                <Text color={theme.dim}>Register one at <Text color={theme.text}>{ENS_DOMAINS_URL}</Text>, then come back and Scan Again.</Text>
+                <Text color={theme.dim}>Register one at <Text color={theme.text}>{ENS_DOMAINS_URL}</Text>, then come back here.</Text>
               </Box>
             )
           : null}
@@ -216,9 +211,6 @@ export function renderSimpleEnsPhase({
         {advancedMode
           ? <Text color={theme.dim}>Owner wallet: <Text color={theme.text}>{shortAddress(ownerAddress)}</Text></Text>
           : null}
-        <Box marginTop={1}>
-          <Text color={theme.dim}>Only root .eth names on Ethereum mainnet are supported.</Text>
-        </Box>
         {phase.error ? <Text color={theme.accentError}>{phase.error}</Text> : null}
         <TextInput
           key={`edit-ens-parent-manual-${advancedMode ? 'advanced' : 'simple'}`}
@@ -266,7 +258,7 @@ export function renderSimpleEnsPhase({
         footer={footerHint('esc cancels')}
       >
         <Box marginTop={1}>
-          <Spinner label="Looking up resolver and address record..." />
+          <Spinner label="checking ENS record..." />
         </Box>
         <EscCancel onCancel={() => backToSimpleSubdomain(phase.fullName)} />
       </Surface>
@@ -294,10 +286,9 @@ export function renderSimpleEnsPhase({
       >
         <Box flexDirection="column">
           <Text color={theme.dim}>Name: <Text color={theme.text}>{phase.fullName}</Text></Text>
-          <Text color={theme.dim}>Connected wallet will create the subdomain and set the required records if checks pass.</Text>
         </Box>
         <Box marginTop={1}>
-          <Spinner label="checking parent ownership and record changes..." />
+          <Spinner label="checking records..." />
         </Box>
         <EscCancel onCancel={() => backToSimpleSubdomain(phase.fullName)} />
       </Surface>

package/src/identity/{hub → manager}/ens/EnsFlow.tsx

@@ -1,19 +1,23 @@
 import React from 'react'
+import { Box, Text } from 'ink'
+import { Surface } from '../../../ui/Surface.js'
+import { Select } from '../../../ui/Select.js'
+import { theme } from '../../../ui/theme.js'
 import { openImageFilePicker } from '../../profile/imagePicker.js'
 import { readOwnerAddressField } from '../../identityCompat.js'
 import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
-import type { ProfileUpdates, Step } from '../identityHubReducer.js'
+import type { ProfileUpdates, Step } from '../reducer.js'
 import { readCustodyMode } from '../custody/state.js'
 import { OperatorWalletsScreen } from './EnsOperatorWalletsScreen.js'
-import { EDIT_PROFILE_STEPS, EditProfileFlow } from '../profile/EditProfileFlow.js'
-import { FlowTimeline } from '../shared/components/FlowTimeline.js'
+import { EditProfileFlow } from '../profile/EditProfileFlow.js'
 import { WalletApprovalScreen } from '../shared/components/WalletApprovalScreen.js'
 import type { AgentReconciliation } from '../shared/reconciliation/index.js'
 
 type StepOf<K extends Step['kind']> = Extract<Step, { kind: K }>
 
-type IdentityHubEnsStep = StepOf<
+type IdentityManagerEnsStep = StepOf<
   | 'manage-ens-operators'
+  | 'edit-profile-menu'
   | 'edit-profile-name'
   | 'edit-profile-description'
   | 'edit-profile-image'
@@ -26,7 +30,7 @@ type IdentityHubEnsStep = StepOf<
 >
 
 type EnsFlowProps = {
-  step: IdentityHubEnsStep
+  step: IdentityManagerEnsStep
   walletSession: BrowserWalletReady | null
   reconciliation: AgentReconciliation
   onSetStep: (step: Step) => void
@@ -34,10 +38,12 @@ type EnsFlowProps = {
   onWalletReady: (session: BrowserWalletReady | null) => void
   onTriggerRebackup: (backStep: Step, profileUpdates?: ProfileUpdates) => void
   onTriggerPublicProfileSave: (backStep: Step, profileUpdates: ProfileUpdates) => void
+  onWithdrawFromVault: (step: IdentityManagerEnsStep) => void
 }
 
-export function isEnsStep(step: Step): step is IdentityHubEnsStep {
+export function isEnsStep(step: Step): step is IdentityManagerEnsStep {
   return step.kind === 'manage-ens-operators'
+    || step.kind === 'edit-profile-menu'
     || step.kind === 'edit-profile-name'
     || step.kind === 'edit-profile-description'
     || step.kind === 'edit-profile-image'
@@ -58,7 +64,13 @@ export const EnsFlow: React.FC<EnsFlowProps> = ({
   onWalletReady,
   onTriggerRebackup,
   onTriggerPublicProfileSave,
+  onWithdrawFromVault,
 }) => {
+  if (step.kind === 'edit-profile-ens'
+    && (reconciliation.custody === 'advanced' || reconciliation.custody === 'mid-flow-uri-pending')) {
+    return <EnsVaultGate onWithdraw={() => onWithdrawFromVault(step)} onBack={onBack} />
+  }
+
   if (step.kind === 'manage-ens-operators') {
     return (
       <OperatorWalletsScreen
@@ -75,61 +87,116 @@ export const EnsFlow: React.FC<EnsFlowProps> = ({
   }
 
   if (isEditProfileStep(step)) {
+    const editStep = step
+    const menuFromDrafts = (drafts: { name?: string; description?: string; imagePath?: string }) => {
+      const next: Step = {
+        kind: 'edit-profile-menu',
+        identity: editStep.identity,
+        registry: editStep.registry,
+        returnTo: 'returnTo' in editStep ? editStep.returnTo : undefined,
+        ...(drafts.name !== undefined ? { name: drafts.name } : {}),
+        ...(drafts.description !== undefined ? { description: drafts.description } : {}),
+        ...(drafts.imagePath !== undefined ? { imagePath: drafts.imagePath } : {}),
+      }
+      onSetStep(next)
+    }
+    const currentDrafts = () => ({
+      name: 'name' in editStep ? editStep.name : undefined,
+      description: 'description' in editStep ? editStep.description : undefined,
+      imagePath: 'imagePath' in editStep ? editStep.imagePath : undefined,
+    })
     return (
       <EditProfileFlow
         step={step}
         reconciliation={reconciliation}
-        onNameSubmit={name => {
-          if (step.kind !== 'edit-profile-name') return
+        onSelectField={field => {
+          if (editStep.kind !== 'edit-profile-menu') return
+          const carry = currentDrafts()
+          if (field === 'name') {
+            onSetStep({
+              kind: 'edit-profile-name',
+              identity: editStep.identity,
+              registry: editStep.registry,
+              ...(carry.name !== undefined ? { name: carry.name } : {}),
+              ...(carry.description !== undefined ? { description: carry.description } : {}),
+              ...(carry.imagePath !== undefined ? { imagePath: carry.imagePath } : {}),
+              returnTo: editStep.returnTo,
+            })
+            return
+          }
+          if (field === 'description') {
+            onSetStep({
+              kind: 'edit-profile-description',
+              identity: editStep.identity,
+              registry: editStep.registry,
+              ...(carry.name !== undefined ? { name: carry.name } : {}),
+              ...(carry.description !== undefined ? { description: carry.description } : {}),
+              ...(carry.imagePath !== undefined ? { imagePath: carry.imagePath } : {}),
+              returnTo: editStep.returnTo,
+            })
+            return
+          }
           onSetStep({
-            kind: 'edit-profile-description',
-            identity: step.identity,
-            registry: step.registry,
-            name,
-            description: step.description,
-            imagePath: step.imagePath,
-            returnTo: step.returnTo,
+            kind: 'edit-profile-image',
+            identity: editStep.identity,
+            registry: editStep.registry,
+            ...(carry.name !== undefined ? { name: carry.name } : {}),
+            ...(carry.description !== undefined ? { description: carry.description } : {}),
+            ...(carry.imagePath !== undefined ? { imagePath: carry.imagePath } : {}),
+            returnTo: editStep.returnTo,
           })
         }}
+        onSaveProfile={() => {
+          if (editStep.kind !== 'edit-profile-menu') return
+          const carry = currentDrafts()
+          const savedName = (editStep.identity.state as Record<string, unknown> | undefined)?.['name'] as string | undefined
+          const savedDescription = (editStep.identity.state as Record<string, unknown> | undefined)?.['description'] as string | undefined
+          const updates: ProfileUpdates = {
+            name: carry.name ?? savedName ?? '',
+            description: carry.description ?? savedDescription ?? '',
+            ...(carry.imagePath !== undefined ? { imagePath: carry.imagePath } : {}),
+          }
+          onTriggerPublicProfileSave(editStep.returnTo ?? { kind: 'continuity-public' }, updates)
+        }}
+        onNameSubmit={name => {
+          if (editStep.kind !== 'edit-profile-name') return
+          menuFromDrafts({ ...currentDrafts(), name })
+        }}
         onDescriptionSubmit={description => {
-          if (step.kind !== 'edit-profile-description') return
-          onSetStep({ kind: 'edit-profile-image', identity: step.identity, registry: step.registry, name: step.name, description, imagePath: step.imagePath, returnTo: step.returnTo })
+          if (editStep.kind !== 'edit-profile-description') return
+          menuFromDrafts({ ...currentDrafts(), description })
         }}
         onIconSubmit={iconPath => {
-          if (step.kind !== 'edit-profile-image') return
-          onSetStep({ kind: 'edit-profile-review', identity: step.identity, registry: step.registry, name: step.name, description: step.description, ...(iconPath !== undefined ? { imagePath: iconPath } : {}), returnTo: step.returnTo })
+          if (editStep.kind !== 'edit-profile-image') return
+          if (iconPath === undefined) {
+            menuFromDrafts(currentDrafts())
+            return
+          }
+          menuFromDrafts({ ...currentDrafts(), imagePath: iconPath })
         }}
         onIconPick={() => {
-          if (step.kind !== 'edit-profile-image') return
-          const iconStep = step
+          if (editStep.kind !== 'edit-profile-image') return
+          const iconStep = editStep
           void openImageFilePicker()
             .then(result => {
               if (!result.ok) {
                 onSetStep({ ...iconStep, error: result.cancelled ? 'icon selection cancelled.' : `${result.error}` })
                 return
               }
-              onSetStep({
-                kind: 'edit-profile-review',
-                identity: iconStep.identity,
-                registry: iconStep.registry,
-                name: iconStep.name,
-                description: iconStep.description,
-                imagePath: result.file,
-                returnTo: iconStep.returnTo,
-              })
+              menuFromDrafts({ ...currentDrafts(), imagePath: result.file })
             })
             .catch((err: unknown) => {
               onSetStep({ ...iconStep, error: `${(err as Error).message}` })
             })
         }}
         onReviewSave={() => {
-          if (step.kind !== 'edit-profile-review') return
+          if (editStep.kind !== 'edit-profile-review') return
           const updates: ProfileUpdates = {
-            name: step.name,
-            description: step.description,
-            ...(step.imagePath !== undefined ? { imagePath: step.imagePath } : {}),
+            name: editStep.name,
+            description: editStep.description,
+            ...(editStep.imagePath !== undefined ? { imagePath: editStep.imagePath } : {}),
           }
-          onTriggerPublicProfileSave(step.returnTo ?? { kind: 'continuity-public' }, updates)
+          onTriggerPublicProfileSave(editStep.returnTo ?? { kind: 'continuity-public' }, updates)
         }}
         onEnsLink={(fullName, options) => {
           if (step.kind !== 'edit-profile-ens') return
@@ -194,6 +261,7 @@ export const EnsFlow: React.FC<EnsFlowProps> = ({
         }}
         onBack={onBack}
         onMenu={() => onSetStep(step.returnTo ?? { kind: 'continuity-public' })}
+        onBackToEditMenu={() => menuFromDrafts(currentDrafts())}
       />
     )
   }
@@ -206,7 +274,7 @@ export const EnsFlow: React.FC<EnsFlowProps> = ({
           ? `Ethereum Mainnet: sign one transaction to clear ethagent record values on ${step.fullName}. Requires gas.`
           : `Ethereum Mainnet: sign one transaction to set ENS records on ${step.fullName}. Requires gas.`}
         walletSession={walletSession}
-        label="waiting for wallet transaction..."
+        label={step.clearRecords ? 'waiting for wallet to clear ENS records...' : 'waiting for wallet to update ENS records...'}
         onCancel={() => onSetStep({ kind: 'edit-profile-ens', identity: step.identity, registry: step.registry, returnTo: step.returnTo })}
       />
     )
@@ -219,7 +287,7 @@ export const EnsFlow: React.FC<EnsFlowProps> = ({
         title={step.setup.mode === 'simple' ? 'Use Connected Wallet' : 'Use Owner Wallet'}
         subtitle={`${signer} signs one Ethereum Mainnet ENS registry transaction for ${step.setup.fullName}.`}
         walletSession={walletSession}
-        label={step.setup.mode === 'simple' ? 'waiting for connected wallet transaction...' : 'waiting for owner wallet transaction...'}
+        label="waiting for wallet to register the ENS name..."
         onCancel={() => onSetStep({
           kind: 'edit-profile-ens',
           identity: step.identity,
@@ -238,7 +306,7 @@ export const EnsFlow: React.FC<EnsFlowProps> = ({
         title={step.setup.mode === 'simple' ? 'Use Connected Wallet' : 'Use Owner Wallet'}
         subtitle={`${signer} signs one Ethereum Mainnet resolver transaction for ${step.setup.fullName}.`}
         walletSession={walletSession}
-        label={step.setup.mode === 'simple' ? 'waiting for connected wallet transaction...' : 'waiting for owner wallet transaction...'}
+        label="waiting for wallet to set ENS records..."
         onCancel={() => onSetStep({
           kind: 'edit-profile-ens',
           identity: step.identity,
@@ -276,7 +344,7 @@ function publicProfileWalletApprovalView(step: StepOf<'public-profile-signing'>)
   }
   return {
     title: 'Use Wallet',
-    subtitle: <FlowTimeline steps={EDIT_PROFILE_STEPS} current={5} />,
+    subtitle: 'Sign the public profile and ERC-8004 token URI update.',
     label: 'waiting for wallet signature...',
   }
 }
@@ -288,16 +356,40 @@ function usesAdvancedSetup(step: StepOf<'public-profile-signing'>): boolean {
   return custodyMode === 'advanced' && typeof ownerAddress === 'string' && ownerAddress.trim().length > 0
 }
 
-function isEditProfileStep(step: IdentityHubEnsStep): step is StepOf<
+function isEditProfileStep(step: IdentityManagerEnsStep): step is StepOf<
+  | 'edit-profile-menu'
   | 'edit-profile-name'
   | 'edit-profile-description'
   | 'edit-profile-image'
   | 'edit-profile-review'
   | 'edit-profile-ens'
 > {
-  return step.kind === 'edit-profile-name'
+  return step.kind === 'edit-profile-menu'
+    || step.kind === 'edit-profile-name'
     || step.kind === 'edit-profile-description'
     || step.kind === 'edit-profile-image'
     || step.kind === 'edit-profile-review'
     || step.kind === 'edit-profile-ens'
 }
+
+const EnsVaultGate: React.FC<{ onWithdraw: () => void; onBack: () => void }> = ({ onWithdraw, onBack }) => (
+  <Surface
+    title="ENS Name"
+    footer={<Text color={theme.dim}>Token is in the Vault · enter select · esc back</Text>}
+  >
+    <Box marginBottom={1}>
+      <Text color={theme.textSubtle}>The owner wallet must hold the token directly to sign the ENS setup transaction.</Text>
+    </Box>
+    <Select<'withdraw' | 'back'>
+      options={[
+        { value: 'withdraw', role: 'section', label: 'Proceed' },
+        { value: 'withdraw', label: 'Withdraw Token from Vault' },
+        { value: 'back', role: 'section', label: 'Navigation' },
+        { value: 'back', label: 'Back', role: 'utility' },
+      ]}
+      hintLayout="inline"
+      onSubmit={choice => { if (choice === 'withdraw') onWithdraw(); else onBack() }}
+      onCancel={onBack}
+    />
+  </Surface>
+)