ethagent 3.3.3 → 4.0.0

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

@@ -19,7 +19,7 @@ import { FlowTimeline } from '../shared/components/FlowTimeline.js'
 import { OPEN_BROWSER_HINT } from '../shared/components/WalletApprovalScreen.js'
 import { readCustodyMode } from '../custody/state.js'
 import { shortAddress } from '../shared/model/format.js'
-import type { ProfileUpdates } from '../identityHubReducer.js'
+import type { ProfileUpdates } from '../reducer.js'
 import {
   normalizeApprovedOperatorWallets,
   removeApprovedOperatorWallet,
@@ -150,19 +150,17 @@ export const OperatorWalletsScreen: React.FC<OperatorWalletsScreenProps> = ({
     return (
       <Surface
         title="Operator Wallets"
-        subtitle="Advanced custody must be set up before operator wallets can be managed."
+        subtitle="Set up Advanced custody first."
         footer={footerHint('enter select · esc back')}
       >
         <Box flexDirection="column">
-          <Text color={theme.dim}>Switch to Advanced custody from the Custody Mode menu to capture an owner wallet.</Text>
-          <Text color={theme.dim}>Operator wallets can be changed later and never receive token control.</Text>
           {phase.kind === 'main' && phase.error ? <Text color={theme.accentError}>{phase.error}</Text> : null}
         </Box>
         <Box marginTop={1}>
           <Select<'back'>
             options={[
               { value: 'back', role: 'section', label: 'Navigation' },
-              { value: 'back', label: 'Back', hint: 'Return to the previous screen', role: 'utility' },
+              { value: 'back', label: 'Back', role: 'utility' },
             ]}
             hintLayout="inline"
             onSubmit={() => onBack()}
@@ -180,7 +178,6 @@ export const OperatorWalletsScreen: React.FC<OperatorWalletsScreenProps> = ({
         subtitle={
           <Box flexDirection="column">
             <FlowTimeline steps={['Verify Operator', 'Sign Backup', 'Publish Snapshot', 'Approve ENS', 'Approve Vault']} current={1} />
-            <Text color={theme.dim}>Operator wallet signs restore access. Owner wallet then re-attests the backup, publishes the new snapshot, and authorizes the operator onchain (ENS + vault).</Text>
           </Box>
         }
         walletSession={walletSession}
@@ -202,7 +199,7 @@ export const OperatorWalletsScreen: React.FC<OperatorWalletsScreenProps> = ({
   return (
     <Surface
       title="Operator Wallets"
-      subtitle="Owner wallet controls this list. The active operator wallet signs frequent updates; others stay authorized."
+      subtitle="Owner wallet controls this list."
       footer={footerHint('enter select · esc back')}
     >
       <Box flexDirection="column">
@@ -284,7 +281,7 @@ function operatorOptions(args: {
 }): Array<SelectOption<OperatorAction>> {
   const options: Array<SelectOption<OperatorAction>> = [
     { value: 'add-browser', role: 'section', label: 'Operator Wallets' },
-    { value: 'add-browser', label: 'Add Wallet', hint: 'Connect wallet to sign restore access' },
+    { value: 'add-browser', label: 'Add Wallet' },
   ]
   if (args.records[0]) options.push({ value: `remove:${args.records[0].address}`, role: 'section', label: 'Operator Wallets' })
   for (const record of args.records) {
@@ -293,27 +290,23 @@ function operatorOptions(args: {
       options.push({
         value: `activate:${record.address}`,
         label: `Set Active: ${shortAddress(record.address)}`,
-        hint: 'Make this the active operator wallet (owner wallet signs)',
       })
     }
     options.push({
       value: `remove:${record.address}`,
       label: `Unlink ${shortAddress(record.address)}${active ? ' (active)' : ''}`,
-      hint: active
-        ? 'Active operator wallet. Unlinking clears the active slot; pick a new active from the list.'
-        : 'Remove this wallet from the approved list (owner wallet signs)',
+      ...(active ? {} : { hint: 'Remove' }),
     })
   }
   if (args.records.length > 1) {
     options.push({
       value: 'remove-all',
       label: 'Unlink All Operator Wallets',
-      hint: 'Remove every approved operator wallet (owner wallet signs)',
     })
   }
   options.push(
     { value: 'back', role: 'section', label: 'Navigation' },
-    { value: 'back', label: 'Back', hint: 'Return to the previous screen', role: 'utility' },
+    { value: 'back', label: 'Back', role: 'utility' },
   )
   return options
 }
@@ -332,15 +325,17 @@ const WalletWaitSurface: React.FC<{
   })
   return (
     <Surface title={title} subtitle={subtitle} footer={footerHint('esc cancels')}>
-      <Box marginTop={1}>
-        <Spinner label={walletSession ? 'waiting for wallet signature...' : 'opening wallet request...'} />
-      </Box>
       {walletSession ? (
         <Box flexDirection="column">
-          <Text color={theme.accentPeriwinkle} underline>{walletSession.url}</Text>
+          <Text color={theme.accentBlue} underline>{walletSession.url}</Text>
           <Text color={theme.dim}>{OPEN_BROWSER_HINT}</Text>
+          <Box marginTop={1}>
+            <Spinner label="waiting for operator wallet signature..." />
+          </Box>
         </Box>
-      ) : null}
+      ) : (
+        <Spinner label="opening wallet request..." />
+      )}
     </Surface>
   )
 }

package/src/identity/{hub → manager}/ens/editCopy.ts

@@ -1,6 +1,6 @@
 import { getAddress, type Address } from 'viem'
 import type { AgentEnsRecords, AgentRecordDiff } from '../../ens/agentRecords.js'
-import type { EnsRegistryAction, EnsSetupBlockedPlan } from '../../ens/ensAutomation.js'
+import type { EnsSetupBlockedPlan } from '../../ens/ensAutomation.js'
 import type { CustodyMode } from '../custody/state.js'
 
 export function abbreviateHexBlobs(input: string): string {
@@ -52,19 +52,6 @@ export function modeSwitchHeading(
   return 'Automation'
 }
 
-export function advancedSubdomainStatusText(action: EnsRegistryAction): string {
-  switch (action) {
-    case 'create-subdomain':
-    case 'create-wrapped-subdomain':
-      return 'Subdomain check: the owner wallet can create this agent ENS name during setup.'
-    case 'set-resolver':
-    case 'set-wrapped-resolver':
-      return 'Subdomain check: the owner wallet can prepare this ENS name during setup.'
-    case 'none':
-      return 'Subdomain check: this ENS name is ready.'
-  }
-}
-
 export function networkLabelForChainId(chainId: number): string {
   switch (chainId) {
     case 1: return 'Ethereum Mainnet'

package/src/identity/{hub → manager}/profile/EditProfileFlow.tsx

@@ -3,19 +3,29 @@ import { Box, Text } from 'ink'
 import { Surface } from '../../../ui/Surface.js'
 import { Select } from '../../../ui/Select.js'
 import { TextInput } from '../../../ui/TextInput.js'
+import { TextArea } from '../../../ui/TextArea.js'
 import { theme } from '../../../ui/theme.js'
 import type { AgentEnsRecordState, AgentEnsRecords } from '../../ens/agentRecords.js'
 import type { EnsSetupPlan } from '../../ens/ensAutomation.js'
-import type { Step } from '../identityHubReducer.js'
+import type { Step } from '../reducer.js'
 import { readIdentityStateString } from '../custody/state.js'
-import { FlowTimeline } from '../shared/components/FlowTimeline.js'
 import { validateAgentIconReference } from '../../profile/agentIcon.js'
 import { EnsEditFlow, type EnsLinkOptions } from '../ens/EnsEditFlow.js'
 import type { AgentReconciliation } from '../shared/reconciliation/index.js'
 
+type EditProfileStepKind =
+  | 'edit-profile-menu'
+  | 'edit-profile-name'
+  | 'edit-profile-description'
+  | 'edit-profile-image'
+  | 'edit-profile-review'
+  | 'edit-profile-ens'
+
 type EditProfileFlowProps = {
-  step: Extract<Step, { kind: 'edit-profile-name' | 'edit-profile-description' | 'edit-profile-image' | 'edit-profile-review' | 'edit-profile-ens' }>
+  step: Extract<Step, { kind: EditProfileStepKind }>
   reconciliation: AgentReconciliation
+  onSelectField: (field: 'name' | 'description' | 'image') => void
+  onSaveProfile: () => void
   onNameSubmit: (name: string) => void
   onDescriptionSubmit: (description: string) => void
   onIconSubmit: (iconPath?: string) => void
@@ -28,16 +38,16 @@ type EditProfileFlowProps = {
   onManageOperatorWalletAccess: () => void
   onBack: () => void
   onMenu: () => void
+  onBackToEditMenu: () => void
 }
 
-const footerHint = (hint: string) => <Text color={theme.dim}>{hint}</Text>
-export const EDIT_PROFILE_STEPS = ['Name', 'Description', 'Icon', 'Review', 'Save']
-const EDIT_NEXT_FOOTER = 'enter next · esc back'
-const EDIT_DESCRIPTION_FOOTER = 'enter next · shift+enter newline · esc back'
+const footerHint = (hint: string) => <Text color={theme.menuStatus}>{hint}</Text>
 
 export const EditProfileFlow: React.FC<EditProfileFlowProps> = ({
   step,
   reconciliation,
+  onSelectField,
+  onSaveProfile,
   onNameSubmit,
   onDescriptionSubmit,
   onIconSubmit,
@@ -50,16 +60,17 @@ export const EditProfileFlow: React.FC<EditProfileFlowProps> = ({
   onManageOperatorWalletAccess,
   onBack,
   onMenu,
+  onBackToEditMenu,
 }) => {
+  if (step.kind === 'edit-profile-menu') {
+    return <EditProfileMenuStep step={step} onSelectField={onSelectField} onSaveProfile={onSaveProfile} onBack={onBack} />
+  }
+
   if (step.kind === 'edit-profile-name') {
     const currentName = step.name ?? readIdentityStateString(step.identity.state, 'name')
     return (
-      <Surface
-        title="Edit Profile"
-        subtitle={<FlowTimeline steps={EDIT_PROFILE_STEPS} current={1} />}
-        footer={footerHint(EDIT_NEXT_FOOTER)}
-      >
-        <Text color={theme.dim}>Saved: {readIdentityStateString(step.identity.state, 'name') || '(unnamed)'}</Text>
+      <Surface title="Edit Name" footer={footerHint('enter save · esc back')}>
+        <Text color={theme.menuStatus}>Saved: {readIdentityStateString(step.identity.state, 'name') || '(unnamed)'}</Text>
         <Box marginTop={1}>
           <TextInput
             key="edit-profile-name"
@@ -67,7 +78,7 @@ export const EditProfileFlow: React.FC<EditProfileFlowProps> = ({
             placeholder="agent name"
             validate={value => value.trim().length >= 2 ? null : 'name must be at least 2 characters'}
             onSubmit={value => onNameSubmit(value.trim())}
-            onCancel={onMenu}
+            onCancel={onBackToEditMenu}
           />
         </Box>
       </Surface>
@@ -75,17 +86,11 @@ export const EditProfileFlow: React.FC<EditProfileFlowProps> = ({
   }
 
   if (step.kind === 'edit-profile-image') {
-    return <AgentIconStep step={step} onIconSubmit={onIconSubmit} onIconPick={onIconPick} onBack={onBack} />
+    return <AgentIconStep step={step} onIconSubmit={onIconSubmit} onIconPick={onIconPick} onBack={onBack} onMenu={onBackToEditMenu} />
   }
 
   if (step.kind === 'edit-profile-review') {
-    return (
-      <EditProfileReviewStep
-        step={step}
-        onSave={onReviewSave}
-        onBack={onBack}
-      />
-    )
+    return <EditProfileReviewStep step={step} onSave={onReviewSave} onBack={onBackToEditMenu} />
   }
 
   if (step.kind === 'edit-profile-ens') {
@@ -108,52 +113,92 @@ export const EditProfileFlow: React.FC<EditProfileFlowProps> = ({
   const currentDescription = readIdentityStateString(step.identity.state, 'description')
   const draftDescription = step.description ?? currentDescription
   return (
-    <Surface
-      title="Edit Profile"
-      subtitle={<FlowTimeline steps={EDIT_PROFILE_STEPS} current={2} />}
-      footer={footerHint(EDIT_DESCRIPTION_FOOTER)}
-    >
-      <Text color={theme.dim}>Saved: {currentDescription || '(no description)'}</Text>
+    <Surface title="Edit Description">
+      <Text color={theme.menuStatus}>Saved: {currentDescription || '(no description)'}</Text>
       <Box marginTop={1}>
-        <TextInput
+        <TextArea
           key="edit-profile-description"
           initialValue={draftDescription}
-          placeholder="description"
-          allowEmpty
-          multiline
+          placeholder="describe this agent"
           onSubmit={value => onDescriptionSubmit(value.trim())}
-          onCancel={onBack}
+          onCancel={onBackToEditMenu}
         />
       </Box>
     </Surface>
   )
 }
 
+const EditProfileMenuStep: React.FC<{
+  step: Extract<Step, { kind: 'edit-profile-menu' }>
+  onSelectField: (field: 'name' | 'description' | 'image') => void
+  onSaveProfile: () => void
+  onBack: () => void
+}> = ({ step, onSelectField, onSaveProfile, onBack }) => {
+  const savedName = readIdentityStateString(step.identity.state, 'name')
+  const savedDescription = readIdentityStateString(step.identity.state, 'description')
+  const savedIcon = readIdentityStateString(step.identity.state, 'imageUrl')
+
+  const draftName = step.name ?? savedName
+  const draftDescription = step.description ?? savedDescription
+  const draftIcon = describeDraftIcon(step.imagePath, savedIcon)
+
+  const nameHint = draftName || '(unnamed)'
+  const descriptionHint = draftDescription || '(no description)'
+  const iconHint = step.imagePath !== undefined
+    ? `${draftIcon} (draft)`
+    : savedIcon
+      ? draftIcon
+      : '(no icon)'
+
+  const dirty = step.name !== undefined || step.description !== undefined || step.imagePath !== undefined
+  const saveHint = dirty ? 'Publish public profile and update the token URI' : 'No changes to save'
+
+  return (
+    <Surface title="Edit Profile" subtitle="Save publishes all fields together." footer={footerHint('enter select · esc back')}>
+      <Select<'name' | 'description' | 'image' | 'save' | 'back'>
+        options={[
+          { value: 'name', label: 'Name', hint: nameHint },
+          { value: 'description', label: 'Description', hint: descriptionHint },
+          { value: 'image', label: 'Icon', hint: iconHint },
+          { value: 'save', label: 'Save Profile', hint: saveHint, disabled: !dirty },
+          { value: 'back', label: 'Back', role: 'utility' },
+        ]}
+        hintLayout="inline"
+        onSubmit={choice => {
+          if (choice === 'name') return onSelectField('name')
+          if (choice === 'description') return onSelectField('description')
+          if (choice === 'image') return onSelectField('image')
+          if (choice === 'save') return onSaveProfile()
+          return onBack()
+        }}
+        onCancel={onBack}
+      />
+    </Surface>
+  )
+}
+
 const AgentIconStep: React.FC<{
   step: Extract<Step, { kind: 'edit-profile-image' }>
   onIconSubmit: (iconPath?: string) => void
   onIconPick: () => void
   onBack: () => void
-}> = ({ step, onIconSubmit, onIconPick, onBack }) => {
+  onMenu: () => void
+}> = ({ step, onIconSubmit, onIconPick, onBack, onMenu }) => {
   const [entryMode, setEntryMode] = React.useState(false)
   const currentIcon = readIdentityStateString(step.identity.state, 'imageUrl')
   const selectedIcon = describeDraftIcon(step.imagePath, currentIcon)
 
   if (entryMode) {
     return (
-      <Surface
-        title="Edit Profile"
-        subtitle={<FlowTimeline steps={EDIT_PROFILE_STEPS} current={3} />}
-        footer={footerHint(EDIT_NEXT_FOOTER)}
-      >
-        <Text color={theme.dim}>Current: {currentIcon ? shortIconReference(currentIcon) : '(no icon)'}</Text>
+      <Surface title="Edit Icon" footer={footerHint('enter save · esc back')}>
+        <Text color={theme.menuStatus}>Current: {currentIcon ? shortIconReference(currentIcon) : '(no icon)'}</Text>
         <Box marginTop={1}>
           <TextInput
             key="edit-profile-icon-entry"
             placeholder="https://.../icon.png or C:\\path\\icon.png"
             validate={validateAgentIconReference}
             onSubmit={value => onIconSubmit(value.trim())}
-            onCancel={onBack}
+            onCancel={() => setEntryMode(false)}
           />
         </Box>
       </Surface>
@@ -161,26 +206,19 @@ const AgentIconStep: React.FC<{
   }
 
   return (
-    <Surface
-      title="Edit Profile"
-      subtitle={<FlowTimeline steps={EDIT_PROFILE_STEPS} current={3} />}
-      footer={footerHint('enter select · esc back')}
-    >
+    <Surface title="Edit Icon" footer={footerHint('enter select · esc back')}>
       <Box flexDirection="column">
-        <Text color={theme.dim}>Agent Icon: {selectedIcon}</Text>
+        <Text color={theme.menuStatus}>Agent Icon: {selectedIcon}</Text>
         {step.error ? <Text color={theme.accentError}>{step.error}</Text> : null}
       </Box>
       <Box marginTop={1}>
         <Select<'choose' | 'enter' | 'skip' | 'delete' | 'back'>
           options={[
-            { value: 'choose', role: 'section', label: 'Icon Source' },
-            { value: 'choose', label: 'Choose Local File', hint: 'Open the operating system file picker' },
-            { value: 'enter', label: 'Enter URL Or Path', hint: 'Use https, ipfs, or a local media path' },
-            { value: 'skip', role: 'section', label: 'Current Icon' },
-            { value: 'skip', label: currentIcon ? 'Keep Current Icon' : 'No Icon', hint: 'Continue without changing the icon' },
-            { value: 'delete', label: 'Remove Agent Icon', hint: 'Clear the public profile icon', disabled: !currentIcon },
-            { value: 'back', role: 'section', label: 'Navigation' },
-            { value: 'back', label: 'Back', hint: 'Return to description', role: 'utility' },
+            { value: 'choose', label: 'Choose Local File', hint: 'Open the file picker' },
+            { value: 'enter', label: 'Enter URL Or Path', hint: 'https, ipfs, or local path' },
+            { value: 'skip', label: currentIcon ? 'Keep Current Icon' : 'No Icon' },
+            { value: 'delete', label: 'Remove Agent Icon', disabled: !currentIcon },
+            { value: 'back', label: 'Back', role: 'utility' },
           ]}
           hintLayout="inline"
           onSubmit={choice => {
@@ -188,9 +226,9 @@ const AgentIconStep: React.FC<{
             if (choice === 'enter') { setEntryMode(true); return }
             if (choice === 'delete') return onIconSubmit('delete')
             if (choice === 'skip') return onIconSubmit(undefined)
-            return onBack()
+            return onMenu()
           }}
-          onCancel={onBack}
+          onCancel={onMenu}
         />
       </Box>
     </Surface>
@@ -204,11 +242,7 @@ const EditProfileReviewStep: React.FC<{
 }> = ({ step, onSave, onBack }) => {
   const currentIcon = readIdentityStateString(step.identity.state, 'imageUrl')
   return (
-    <Surface
-      title="Edit Profile"
-      subtitle={<FlowTimeline steps={EDIT_PROFILE_STEPS} current={4} />}
-      footer={footerHint('enter save · esc back')}
-    >
+    <Surface title="Review Public Profile" footer={footerHint('enter save · esc back')}>
       <Box flexDirection="column">
         <ReviewRow label="Name" value={step.name || '(unnamed)'} />
         <ReviewRow label="Description" value={step.description || '(no description)'} />
@@ -217,9 +251,8 @@ const EditProfileReviewStep: React.FC<{
       <Box marginTop={1}>
         <Select<'save' | 'back'>
           options={[
-            { value: 'save', label: 'Save Public Profile', hint: 'Publish public profile and update the token URI' },
-            { value: 'back', role: 'section', label: 'Navigation' },
-            { value: 'back', label: 'Back', hint: 'Return to Agent Icon', role: 'utility' },
+            { value: 'save', label: 'Save Profile', hint: 'Publish and update URI' },
+            { value: 'back', label: 'Back', role: 'utility' },
           ]}
           hintLayout="inline"
           onSubmit={choice => choice === 'save' ? onSave() : onBack()}
@@ -235,7 +268,7 @@ const ReviewRow: React.FC<{ label: string; value: string }> = ({ label, value })
   return (
     <Box flexDirection="row">
       <Box width={13} flexShrink={0}>
-        <Text color={theme.dim}>{label}</Text>
+        <Text color={theme.menuStatus}>{label}</Text>
       </Box>
       <Box flexDirection="column" flexGrow={1}>
         {lines.map((line, i) => (

package/src/identity/{hub → manager}/profile/effects.ts

@@ -2,7 +2,6 @@ import { getAddress, type Address } from 'viem'
 import type { EthagentIdentity } from '../../../storage/config.js'
 import {
   createWalletRestoreAccessChallenge,
-  serializeContinuitySnapshotEnvelope,
   type WalletChallengePurpose,
 } from '../../continuity/envelope.js'
 import {
@@ -23,10 +22,9 @@ import { resolveValidatedPinataJwt, savePinataJwt } from '../../storage/pinataJw
 import {
   openBrowserWalletSession,
   requestBrowserWalletSignatureAndTransaction,
-  type BrowserWalletSignature,
   type WalletPurpose,
 } from '../../wallet/browserWallet.js'
-import type { ProfileUpdates, Step } from '../identityHubReducer.js'
+import type { ProfileUpdates, Step } from '../reducer.js'
 import { acquireTxGuard, releaseTxGuard } from '../shared/txGuard.js'
 import type { EffectCallbacks } from '../shared/effects/types.js'
 import { awaitConfirmedReceipt } from '../shared/effects/receipts.js'

package/src/identity/{hub → manager}/profile/operatorSave.ts

@@ -20,7 +20,7 @@ import {
 } from '../../registry/erc8004.js'
 import { VAULT_ABI } from '../../registry/vault.js'
 import type { BrowserWalletSignature } from '../../wallet/browserWallet.js'
-import type { Step } from '../identityHubReducer.js'
+import type { Step } from '../reducer.js'
 import {
   assertVerifiedPin,
   deriveAgentName,

package/src/identity/{hub → manager}/profile/state.ts

@@ -6,7 +6,7 @@ import { clearOwnerAddressField, clearVaultAddressField, readOwnerAddressField,
 import { validateAdvancedEnsRelationship } from '../ens/advancedEnsValidation.js'
 import { readCustodyMode } from '../custody/state.js'
 import { ensValidationReasonText } from '../ens/state.js'
-import type { ProfileUpdates } from '../identityHubReducer.js'
+import type { ProfileUpdates } from '../reducer.js'
 import {
   assertActiveOperatorIsApproved,
   mergeApprovedOperatorWallets,

package/src/identity/{hub/identityHubReducer.ts → manager/reducer.ts}

@@ -7,9 +7,10 @@ import type { ContinuitySnapshotEnvelope } from '../continuity/envelope.js'
 import type { AgentEnsRecordState, AgentEnsRecords } from '../ens/agentRecords.js'
 import type { EnsSetupPlan } from '../ens/ensAutomation.js'
 import type { WalletPurpose } from '../wallet/browserWallet.js'
-import type { IdentityHubErrorView } from './shared/model/errors.js'
+import type { IdentityManagerErrorView } from './shared/model/errors.js'
 import type { ApprovedOperatorWalletInput } from './shared/operatorWallets.js'
 import type { CustodyMode } from './custody/state.js'
+import type { ImportCandidate } from './create/importScan.js'
 
 export type RestorePurpose = 'restore' | 'switch'
 type RestoreNotFoundReason = 'no-owner-or-operator' | 'search-incomplete' | 'cancelled'
@@ -29,19 +30,22 @@ export type ProfileUpdates = {
 }
 
 type RestorableBackupEnvelope = AgentStateBackupEnvelope | ContinuitySnapshotEnvelope
+type RestoreFetchingStep = { kind: 'restore-fetching'; cid: string; apiUrl: string; candidate: Erc8004AgentCandidate; requesterAddress?: string; purpose?: RestorePurpose }
 
 export type Step =
   | { kind: 'menu' }
+  | { kind: 'operation-complete'; message: string }
   | { kind: 'replace-confirm'; next: 'create' | 'restore' }
   | { kind: 'create-name'; name?: string; error?: string }
   | { kind: 'create-description'; name: string; description?: string }
   | { kind: 'create-network'; name: string; description: string }
   | { kind: 'create-custody'; name: string; description: string; network?: SelectableNetwork }
-  | { kind: 'create-preflight'; name: string; description: string; network?: SelectableNetwork; custodyMode: CustodyMode }
-  | { kind: 'create-registry'; name: string; description: string; resolution: RegistryResolution; custodyMode: CustodyMode; error?: string }
-  | { kind: 'create-signing'; name: string; description: string; registry: Erc8004RegistryConfig; custodyMode: CustodyMode; pinataJwt?: string }
-  | { kind: 'create-storage'; name: string; description: string; registry: Erc8004RegistryConfig; custodyMode: CustodyMode; error?: string; pinataJwt?: string }
-  | { kind: 'first-run-ens-prompt'; identity: EthagentIdentity; registry: Erc8004RegistryConfig }
+  | { kind: 'create-import'; name: string; description: string; network?: SelectableNetwork; custodyMode: CustodyMode; candidates?: ImportCandidate[] }
+  | { kind: 'create-preflight'; name: string; description: string; network?: SelectableNetwork; custodyMode: CustodyMode; importNotes?: ImportCandidate[] }
+  | { kind: 'create-registry'; name: string; description: string; resolution: RegistryResolution; custodyMode: CustodyMode; error?: string; importNotes?: ImportCandidate[] }
+  | { kind: 'create-signing'; name: string; description: string; registry: Erc8004RegistryConfig; custodyMode: CustodyMode; pinataJwt?: string; importNotes?: ImportCandidate[] }
+  | { kind: 'create-storage'; name: string; description: string; registry: Erc8004RegistryConfig; custodyMode: CustodyMode; error?: string; pinataJwt?: string; importNotes?: ImportCandidate[] }
+  | { kind: 'first-run-ens-prompt'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; origin?: 'create' | 'restore' }
   | { kind: 'restore-wallet'; purpose?: RestorePurpose }
   | { kind: 'restore-network'; ownerHandle: string; purpose?: RestorePurpose }
   | { kind: 'restore-registry'; ownerHandle: string; error?: string; purpose?: RestorePurpose }
@@ -51,7 +55,7 @@ export type Step =
   | { kind: 'restore-token-id-input'; ownerHandle: string; registry: Erc8004RegistryConfig; purpose?: RestorePurpose; busy?: boolean; error?: string }
   | { kind: 'restore-not-found'; ownerHandle: string; registry: Erc8004RegistryConfig; requesterAddress?: string; reason: RestoreNotFoundReason; purpose?: RestorePurpose }
   | { kind: 'restore-select-token'; ownerHandle: string; registry: Erc8004RegistryConfig; candidates: Erc8004AgentCandidate[]; requesterAddress?: string; purpose?: RestorePurpose }
-  | { kind: 'restore-fetching'; cid: string; apiUrl: string; candidate: Erc8004AgentCandidate; requesterAddress?: string; purpose?: RestorePurpose }
+  | RestoreFetchingStep
   | { kind: 'restore-authorizing'; cid: string; apiUrl: string; envelope: RestorableBackupEnvelope; candidate: Erc8004AgentCandidate; requesterAddress?: string; purpose?: RestorePurpose }
   | { kind: 'rebackup-signing'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; pinataJwt?: string; profileUpdates?: ProfileUpdates; returnTo?: Step; walletPurpose?: WalletPurpose; vaultAddress?: `0x${string}` }
   | { kind: 'rebackup-storage'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; error?: string; pinataJwt?: string; profileUpdates?: ProfileUpdates; returnTo?: Step; walletPurpose?: WalletPurpose; vaultAddress?: `0x${string}` }
@@ -67,18 +71,17 @@ export type Step =
   | { kind: 'rebackup-confirm'; back: Step }
   | { kind: 'recovery-refetch-confirm'; back: Step }
   | { kind: 'recovery-refetching'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; back: Step }
+  | { kind: 'continuity-overwrite-confirm'; action: 'restore'; next: RestoreFetchingStep; back: Step }
   | { kind: 'rebackup-start'; back: Step }
+  | { kind: 'edit-profile-menu'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; name?: string; description?: string; imagePath?: string; returnTo?: Step }
   | { kind: 'edit-profile-name'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; name?: string; description?: string; imagePath?: string; returnTo?: Step }
-  | { kind: 'edit-profile-description'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; name: string; description?: string; imagePath?: string; returnTo?: Step }
-  | { kind: 'edit-profile-image'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; name: string; description: string; imagePath?: string; error?: string; returnTo?: Step }
+  | { kind: 'edit-profile-description'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; name?: string; description?: string; imagePath?: string; returnTo?: Step }
+  | { kind: 'edit-profile-image'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; name?: string; description?: string; imagePath?: string; error?: string; returnTo?: Step }
   | { kind: 'edit-profile-review'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; name: string; description: string; imagePath?: string; returnTo?: Step }
   | { kind: 'edit-profile-ens'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; returnTo?: Step; initialView?: 'advanced' }
   | { kind: 'ens-records-tx'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; fullName: string; records: AgentEnsRecords; currentRecords?: AgentEnsRecordState; ownerAddress?: string; returnTo?: Step; clearRecords?: boolean }
   | { kind: 'ens-setup-registry-tx'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; setup: EnsSetupPlan; returnTo?: Step }
   | { kind: 'ens-setup-records-tx'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; setup: EnsSetupPlan; returnTo?: Step; registryTxHash?: string }
-  | { kind: 'ens-clear-flow-running'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; fullName: string; ownerAddress: `0x${string}`; records: AgentEnsRecords; currentRecords?: AgentEnsRecordState; pinataJwt?: string; returnTo?: Step }
-  | { kind: 'ens-update-flow-running'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; fullName: string; ownerAddress: `0x${string}`; records: AgentEnsRecords; currentRecords?: AgentEnsRecordState; pinataJwt?: string; returnTo?: Step }
-  | { kind: 'ens-link-flow-running'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; setup: EnsSetupPlan; pinataJwt?: string; returnTo?: Step }
   | { kind: 'manage-ens-operators'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; returnTo?: Step; notice?: string; error?: string }
   | { kind: 'custody-model'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; returnTo?: Step; notice?: string }
   | { kind: 'custody-advanced-confirm'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; returnTo?: Step }
@@ -103,14 +106,14 @@ export type Step =
   | { kind: 'details' }
   | { kind: 'save-prompt'; back: Step }
   | { kind: 'busy'; label: string }
-  | { kind: 'error'; error: IdentityHubErrorView; back: Step }
+  | { kind: 'error'; error: IdentityManagerErrorView; back: Step }
   | { kind: 'identity-unlinked'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; onChainOwner?: string; back: Step }
 
 export type Action =
   | { type: 'setStep'; step: Step }
   | { type: 'back'; from: Step }
 
-export function identityHubReducer(state: Step, action: Action): Step {
+export function identityManagerReducer(state: Step, action: Action): Step {
   switch (action.type) {
     case 'setStep':
       return action.step
@@ -131,6 +134,8 @@ function backStep(from: Step): Step {
       return { kind: 'create-description', name: from.name, description: from.description }
     case 'create-custody':
       return { kind: 'create-network', name: from.name, description: from.description }
+    case 'create-import':
+      return { kind: 'create-custody', name: from.name, description: from.description, ...(from.network ? { network: from.network } : {}) }
     case 'create-preflight':
       return { kind: 'create-custody', name: from.name, description: from.description, ...(from.network ? { network: from.network } : {}) }
     case 'create-registry':
@@ -192,8 +197,12 @@ function backStep(from: Step): Step {
     case 'recovery-refetch-confirm':
     case 'recovery-refetching':
       return { kind: 'menu' }
-    case 'edit-profile-name':
+    case 'continuity-overwrite-confirm':
+      return from.back
+    case 'edit-profile-menu':
       return from.returnTo ?? { kind: 'continuity-public' }
+    case 'edit-profile-name':
+      return { kind: 'edit-profile-menu', identity: from.identity, registry: from.registry, name: from.name, description: from.description, imagePath: from.imagePath, returnTo: from.returnTo }
     case 'edit-profile-description':
       return { kind: 'edit-profile-name', identity: from.identity, registry: from.registry, name: from.name, description: from.description, imagePath: from.imagePath, returnTo: from.returnTo }
     case 'edit-profile-image':
@@ -213,17 +222,6 @@ function backStep(from: Step): Step {
         returnTo: from.returnTo,
         ...(from.setup.mode === 'advanced' ? { initialView: 'advanced' as const } : {}),
       }
-    case 'ens-clear-flow-running':
-    case 'ens-update-flow-running':
-      return { kind: 'edit-profile-ens', identity: from.identity, registry: from.registry, returnTo: from.returnTo }
-    case 'ens-link-flow-running':
-      return {
-        kind: 'edit-profile-ens',
-        identity: from.identity,
-        registry: from.registry,
-        returnTo: from.returnTo,
-        ...(from.setup.mode === 'advanced' ? { initialView: 'advanced' as const } : {}),
-      }
     case 'manage-ens-operators':
       return from.returnTo ?? { kind: 'menu' }
     case 'custody-model':
@@ -276,6 +274,7 @@ export function createStepNumber(step: Step): number {
       return 3
     case 'create-custody':
       return 4
+    case 'create-import':
     case 'create-preflight':
     case 'create-storage':
     case 'create-registry':