ethagent 3.3.3 → 4.0.0

package/src/identity/continuity/envelopeParse.ts

@@ -36,6 +36,8 @@ import {
   type WalletContinuitySnapshotSlot,
 } from './envelopeTypes.js'
 
+const MAX_WALLET_RESTORE_SLOTS = 256
+
 export function restoreContinuitySnapshotEnvelope(args: {
   envelope: ContinuitySnapshotEnvelope
   walletSignature: string
@@ -232,7 +234,7 @@ function restoreTransferContinuitySnapshotEnvelope(args: {
 }): ContinuitySnapshotPayload {
   const currentAddress = args.currentOwnerAddress
     ? toChecksumAddress(args.currentOwnerAddress)
-    : toChecksumAddress(recoverAddressFromSignature(args.envelope.challenge, args.walletSignature))
+    : recoverTransferSlotAddress(args.envelope, args.walletSignature)
   const slot = transferSlotForCurrentOwner(args.envelope, currentAddress)
   assertSignatureForAddress(slot.challenge, args.walletSignature, slot.address)
 
@@ -348,6 +350,20 @@ function walletSlotForRestore(
   throw new ContinuitySnapshotRestoreSlotMissingError('unknown')
 }
 
+function recoverTransferSlotAddress(
+  envelope: TransferContinuitySnapshotEnvelope,
+  walletSignature: string,
+): string {
+  for (const slot of [envelope.slots.owner, envelope.slots.target]) {
+    try {
+      const recovered = recoverAddressFromSignature(slot.challenge, walletSignature)
+      if (recovered.toLowerCase() === slot.address.toLowerCase()) return toChecksumAddress(slot.address)
+    } catch {
+    }
+  }
+  throw new ContinuityTransferSnapshotTargetMismatchError(envelope.ownerAddress, envelope.targetAddress, 'unknown')
+}
+
 function transferSlotForCurrentOwner(
   envelope: TransferContinuitySnapshotEnvelope,
   currentOwner: string,
@@ -368,6 +384,9 @@ export function normalizeContinuitySnapshotEnvelope(input: unknown): ContinuityS
     }
     const ownerAddress = toChecksumAddress(input.ownerAddress)
     const token = normalizeContinuitySnapshotToken(input.token)
+    if (input.slots.length > MAX_WALLET_RESTORE_SLOTS) {
+      throw new Error('Continuity wallet snapshot has too many restore slots')
+    }
     const slots = input.slots.map(normalizeWalletSlot)
     if (slots.length === 0) throw new Error('Continuity wallet snapshot needs at least one slot')
     return {

package/src/identity/continuity/publicSkills.ts

@@ -1,7 +1,8 @@
 import type { EthagentIdentity } from '../../storage/config.js'
 import type { SkillIndexEntry } from './skills/types.js'
-import { identityOwnerAddress } from '../hub/custody/state.js'
+import { identityOwnerAddress } from '../manager/custody/state.js'
 import { toChecksumAddress } from '../crypto/eth.js'
+import { isDraftScaffold } from './skills/scaffold.js'
 
 type PublicSkill = {
   id: string
@@ -82,6 +83,7 @@ export function appendPublicSkillEntries(
   const usedIds = new Set(baselineIds)
   for (const entry of entries) {
     if (entry.visibility !== 'public') continue
+    if (isDraftScaffold(entry)) continue
     const id = uniqueSkillId(entry.name, usedIds)
     usedIds.add(id)
     appended.push({

package/src/identity/continuity/skills/publicSkillsSync.ts

@@ -8,11 +8,12 @@ import {
 } from '../publicSkills.js'
 import { ensureContinuityVault, ensureTrailingNewline, readOrDefault } from '../storage/files.js'
 import { listSkills } from './loadSkills.js'
+import { isDraftScaffold } from './scaffold.js'
 import type { SkillIndexEntry } from './types.js'
 
 export async function derivePublicSkillEntries(identity: EthagentIdentity): Promise<SkillIndexEntry[]> {
   const entries = await listSkills(identity)
-  return entries.filter(entry => entry.visibility === 'public')
+  return entries.filter(entry => entry.visibility === 'public' && !isDraftScaffold(entry))
 }
 
 export async function renderAgentCardJsonForIdentity(identity: EthagentIdentity): Promise<string> {

package/src/identity/continuity/skills/scaffold.ts

@@ -9,13 +9,13 @@ export function defaultSkillScaffold({ name, visibility = 'public' }: SkillScaff
   return [
     '---',
     `name: ${name}`,
-    'description:',
+    'description: <one-line public description before publishing>',
     `visibility: ${visibility}`,
     '---',
     '',
     '# Overview',
     '',
-    'Describe in one or two sentences what this skill does and the problem it solves.',
+    'Replace this draft with one or two sentences describing what this skill does and the problem it solves.',
     '',
     '# When to use',
     '',
@@ -48,5 +48,8 @@ export function isDraftScaffold(entry: { description: string; name: string }): b
   if (desc.length === 0) return true
   if (/^<.*>$/.test(desc)) return true
   if (desc === entry.name) return true
+  if (/^overview$/i.test(desc)) return true
+  if (/^describe in one or two sentences/i.test(desc)) return true
+  if (/^replace this draft/i.test(desc)) return true
   return false
 }

package/src/identity/continuity/snapshots.ts

@@ -82,7 +82,7 @@ export async function updatePublishedContinuitySnapshotContentHashes(
 ): Promise<void> {
   await ensureContinuityVault(identity)
   const current = currentPublishedSnapshot(identity)
-  const snapshots = await readPublishedContinuitySnapshotFile(identity)
+  const { snapshots, unparsable } = await readPublishedContinuitySnapshotLines(identity)
   const index = snapshots.findIndex(item => item.cid === cid)
   if (index === -1) {
     const base = current.find(item => item.cid === cid)
@@ -93,7 +93,7 @@ export async function updatePublishedContinuitySnapshotContentHashes(
   }
   await atomicWriteText(
     publishedContinuitySnapshotsPath(identity),
-    snapshots.map(snapshot => JSON.stringify(snapshot)).join('\n') + '\n',
+    [...snapshots.map(snapshot => JSON.stringify(snapshot)), ...unparsable].join('\n') + '\n',
     { mode: 0o600 },
   )
 }
@@ -143,25 +143,32 @@ function refreshPublishedSnapshotSidecars(
 }
 
 async function readPublishedContinuitySnapshotFile(identity: EthagentIdentity): Promise<PublishedContinuitySnapshot[]> {
+  return (await readPublishedContinuitySnapshotLines(identity)).snapshots
+}
+
+async function readPublishedContinuitySnapshotLines(
+  identity: EthagentIdentity,
+): Promise<{ snapshots: PublishedContinuitySnapshot[]; unparsable: string[] }> {
   let raw: string
   try {
     raw = await fs.readFile(publishedContinuitySnapshotsPath(identity), 'utf8')
   } catch (error: unknown) {
-    if ((error as NodeJS.ErrnoException).code === 'ENOENT') return []
+    if ((error as NodeJS.ErrnoException).code === 'ENOENT') return { snapshots: [], unparsable: [] }
     throw error
   }
 
   const snapshots: PublishedContinuitySnapshot[] = []
+  const unparsable: string[] = []
   for (const line of raw.split('\n')) {
     const trimmed = line.trim()
     if (!trimmed) continue
     try {
       snapshots.push(JSON.parse(trimmed) as PublishedContinuitySnapshot)
     } catch {
-      continue
+      unparsable.push(trimmed)
     }
   }
-  return snapshots
+  return { snapshots, unparsable }
 }
 
 function currentPublishedSnapshot(identity: EthagentIdentity): PublishedContinuitySnapshot[] {

package/src/identity/continuity/storage/defaults.ts

@@ -32,27 +32,27 @@ export function defaultContinuityFiles(identity: EthagentIdentity, _now = new Da
       '',
       '## Persona',
       '',
-      'The standing voice, collaboration style, and behavior this agent keeps across sessions and models.',
+      'Stable identity, voice, and collaboration defaults this agent carries across sessions and models. Replace these prompts with durable instructions.',
       '',
-      '- Voice: <e.g., direct, concise, no filler>',
-      '- Tone: <e.g., warm but professional>',
-      '- Communication style: <e.g., bullet lists for technical work, prose for narrative>',
+      '- Role: what this agent is and the kind of work it should be trusted with.',
+      '- Voice: how it should sound when helping you.',
+      '- Collaboration style: how it should plan, ask questions, and present tradeoffs.',
       '',
       '## Principles',
       '',
-      'Owner-approved working principles. Decisions that should be made the same way every time.',
+      'Owner-approved defaults for repeated decisions. Keep these durable, specific, and easy to apply.',
       '',
-      '- <principle: e.g., always confirm before destructive operations>',
-      '- <principle: e.g., bias toward editing existing code over creating new files>',
-      '- <principle: e.g., never hide errors, always surface them clearly>',
+      '- Decision rule: how the agent should choose when there are tradeoffs.',
+      '- Engineering standard: what quality bar it should preserve.',
+      '- Escalation rule: when it should stop and ask.',
       '',
       '## Boundaries',
       '',
-      'What this agent must never do, regardless of how it is asked.',
+      'Private limits and hard constraints. These override task-level convenience.',
       '',
-      '- <boundary: e.g., never bypass authentication or authorization checks>',
-      '- <boundary: e.g., never commit secrets to source control>',
       '- Never store seed phrases, private keys, raw wallet signatures, or API keys.',
+      '- Ask for explicit approval before destructive operations.',
+      '- Public capabilities belong in skill folders; keep private persona and limits here.',
       '',
     ].join('\n'),
     'MEMORY.md': [
@@ -62,11 +62,11 @@ export function defaultContinuityFiles(identity: EthagentIdentity, _now = new Da
       '',
       '## Durable User Preferences',
       '',
-      'Long-lived owner preferences that survive sessions and model switches. Capture how the user works.',
+      'Long-lived owner preferences that survive sessions and model switches. Replace these prompts with stable facts.',
       '',
-      '- Communication: <e.g., prefers concise summaries over walls of text>',
-      '- Tooling: <e.g., VS Code, zsh, TypeScript over JavaScript>',
-      '- Workflow: <e.g., reviews PRs in the morning, deploys on Fridays>',
+      '- Name and aliases:',
+      '- Communication preferences:',
+      '- Tooling and workflow:',
       '',
       '## Project Context',
       '',
@@ -74,14 +74,15 @@ export function defaultContinuityFiles(identity: EthagentIdentity, _now = new Da
       '',
       '### <project-name>',
       '',
-      '- Repository: <url or local path>',
-      '- Stack: <languages, frameworks, key libraries>',
-      '- Conventions: <e.g., conventional commits, semver, branch naming>',
-      '- Active workstream: <YYYY-MM-DD what you are focused on>',
+      '- Repository:',
+      '- Stack:',
+      '- Conventions:',
+      '- Active workstream: <YYYY-MM-DD summary>',
       '',
       '## Boundaries',
       '',
       'Never store seed phrases, private keys, raw wallet signatures, or API keys.',
+      'Public capabilities belong in skill folders; keep private user and project facts here.',
       '',
     ].join('\n'),
   }

package/src/identity/continuity/storage/status.ts

@@ -109,7 +109,7 @@ function hashContinuitySnapshotContent(value: string): string {
   return createHash('sha256').update(normalizeSnapshotContent(value), 'utf8').digest('hex')
 }
 
-function normalizeSnapshotContent(value: string): string {
+export function normalizeSnapshotContent(value: string): string {
   const normalized = value.replace(/\r\n?/g, '\n')
   return normalized.endsWith('\n') ? normalized : `${normalized}\n`
 }

package/src/identity/ens/ensLookup/constants.ts

@@ -11,7 +11,7 @@ export const ENS_RPC_URLS = [
   'https://rpc.ankr.com/eth',
 ] as const
 
-export const ETH_NAME_PATTERN = /^([a-z0-9-]+.)+eth$/i
+export const ETH_NAME_PATTERN = /^([a-z0-9-]+\.)+eth$/i
 
 export const ENS_REGISTRY_ABI = parseAbi([
   'function owner(bytes32 node) view returns (address)',

package/src/identity/manager/IdentityManager.tsx

@@ -0,0 +1,33 @@
+import React, { useEffect, useState } from 'react'
+import { Box, useStdout } from 'ink'
+import { IdentityManagerRoutes } from './Routes.js'
+import type { IdentityManagerProps } from './types.js'
+import { useIdentityManagerController } from './useController.js'
+import { Wordmark } from './shared/components/Wordmark.js'
+
+export type {
+  IdentityManagerInitialAction,
+  IdentityManagerResult,
+} from './types.js'
+
+export const IdentityManager: React.FC<IdentityManagerProps> = props => {
+  const controller = useIdentityManagerController(props)
+  const { stdout } = useStdout()
+  const [rows, setRows] = useState<number>(stdout?.rows ?? 24)
+
+  useEffect(() => {
+    if (!stdout) return
+    const onResize = () => setRows(stdout.rows ?? 24)
+    stdout.on('resize', onResize)
+    return () => { stdout.off('resize', onResize) }
+  }, [stdout])
+
+  return (
+    <Box flexDirection="column" alignItems="center" justifyContent="center" width="100%" minHeight={rows}>
+      <Wordmark />
+      <Box flexDirection="column" marginTop={1} width="100%">
+        <IdentityManagerRoutes controller={controller} />
+      </Box>
+    </Box>
+  )
+}

package/src/identity/{hub → manager}/OperationalRoutes.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { hasPendingPublish } from './continuity/state.js'
-import type { ProfileUpdates } from './identityHubReducer.js'
+import type { ProfileUpdates } from './reducer.js'
 import { clearPinataJwt, savePinataJwt } from '../storage/pinataJwt.js'
 import {
   runRebackupStorageSubmit,
@@ -26,6 +26,7 @@ import { DeleteSkillConfirmScreen } from './continuity/skills/DeleteSkillConfirm
 import { RecoveryConfirmScreen } from './continuity/RecoveryConfirmScreen.js'
 import { SavePromptScreen } from './continuity/SavePromptScreen.js'
 import { ErrorScreen } from './shared/components/ErrorScreen.js'
+import { OperationCompleteScreen } from './shared/components/OperationCompleteScreen.js'
 import { UnlinkedIdentityScreen } from './shared/components/UnlinkedIdentityScreen.js'
 import { invalidateOwnershipCache } from './shared/reconciliation/index.js'
 import {
@@ -34,19 +35,18 @@ import {
 } from './ens/EnsFlow.js'
 import { CustodyEditFlow, isCustodyEditStep } from './custody/CustodyEditFlow.js'
 import { rebackupWalletApprovalView } from './shared/utils.js'
-import type { IdentityHubController } from './useIdentityHubController.js'
+import type { IdentityManagerController } from './useController.js'
 
-type IdentityHubOperationalRoutesProps = {
-  controller: IdentityHubController
+type IdentityManagerOperationalRoutesProps = {
+  controller: IdentityManagerController
   footer: React.ReactNode
 }
 
-export const IdentityHubOperationalRoutes: React.FC<IdentityHubOperationalRoutesProps> = ({
+export const IdentityManagerOperationalRoutes: React.FC<IdentityManagerOperationalRoutesProps> = ({
   controller,
   footer,
 }) => {
   const {
-    mode,
     config,
     onComplete,
     identity,
@@ -61,7 +61,7 @@ export const IdentityHubOperationalRoutes: React.FC<IdentityHubOperationalRoutes
     workingStatus,
     setStep,
     back,
-    closeHub,
+    closeManager,
     setWalletSession,
     setJwtSaved,
     setCopyNotice,
@@ -133,14 +133,35 @@ export const IdentityHubOperationalRoutes: React.FC<IdentityHubOperationalRoutes
     return (
       <WalletApprovalScreen
         title="Refetch Latest Snapshot"
-        subtitle="Wallet signature decrypts the latest saved snapshot and restores SOUL.md, MEMORY.md, and skills."
+        subtitle="Decrypts and restores SOUL.md, MEMORY.md, and skills."
         walletSession={walletSession}
-        label={restoreProgress?.label ?? 'fetching latest snapshot from onchain...'}
+        label={restoreProgress?.label ?? (walletSession ? 'waiting for your signature...' : 'fetching snapshot...')}
         onCancel={() => setStep(step.back)}
       />
     )
   }
 
+  if (step.kind === 'continuity-overwrite-confirm') {
+    return (
+      <RecoveryConfirmScreen
+        mode="restore"
+        workingStatus={workingStatus}
+        footer={footer}
+        onConfirm={() => setStep(step.next)}
+        onBack={() => setStep(step.back)}
+      />
+    )
+  }
+
+  if (step.kind === 'operation-complete') {
+    return (
+      <OperationCompleteScreen
+        message={step.message}
+        onReturn={() => setStep({ kind: 'menu' })}
+      />
+    )
+  }
+
   if (step.kind === 'continuity-private') {
     return (
       <PrivateContinuityScreen
@@ -281,6 +302,7 @@ export const IdentityHubOperationalRoutes: React.FC<IdentityHubOperationalRoutes
         onWalletReady={setWalletSession}
         onTriggerRebackup={triggerRebackup}
         onTriggerPublicProfileSave={triggerPublicProfileSave}
+        onWithdrawFromVault={s => custodyFlow.beginWithdrawToken(s, s, 'ens')}
       />
     )
   }
@@ -299,8 +321,6 @@ export const IdentityHubOperationalRoutes: React.FC<IdentityHubOperationalRoutes
         onSetStep={setStep}
         onSwitchToAdvanced={(returnTo, updates) => custodyFlow.beginVaultDeposit(step, returnTo, updates)}
         onSwitchToSimple={(returnTo, updates) => custodyFlow.beginVaultUnwrap(step, returnTo, updates)}
-        onWithdrawToken={returnTo => custodyFlow.beginWithdrawToken(step, returnTo)}
-        onReturnToVault={(returnTo, vaultAddress) => custodyFlow.beginReturnToVault(step, returnTo, vaultAddress)}
         onResumeAdvanced={returnTo => {
           const vaultAddress = resolveVaultAddress(step.identity, config?.erc8004?.operatorVaults)
           const updates: ProfileUpdates = {
@@ -340,8 +360,8 @@ export const IdentityHubOperationalRoutes: React.FC<IdentityHubOperationalRoutes
   if (step.kind === 'rebackup-start') {
     return (
       <BusyScreen
-        title="Identity Hub"
-        label="preparing encrypted snapshot..."
+        title="Identity"
+        label="preparing snapshot..."
         onCancel={back}
       />
     )
@@ -385,7 +405,7 @@ export const IdentityHubOperationalRoutes: React.FC<IdentityHubOperationalRoutes
     return (
       <WalletApprovalScreen
         title="Connect Wallet"
-        subtitle="Find agents this wallet owns, whether held directly or linked to it."
+        subtitle="Find agents this wallet owns or is linked to."
         walletSession={walletSession}
         label="waiting for wallet connection..."
         onCancel={() => setStep({ kind: 'menu' })}
@@ -396,7 +416,7 @@ export const IdentityHubOperationalRoutes: React.FC<IdentityHubOperationalRoutes
   if (step.kind === 'busy') {
     return (
       <BusyScreen
-        title="Identity Hub"
+        title="Identity"
         label={step.label}
         onCancel={back}
       />
@@ -409,10 +429,9 @@ export const IdentityHubOperationalRoutes: React.FC<IdentityHubOperationalRoutes
         error={step.error}
         back={step.back}
         footer={footer}
-        closeLabel={mode === 'first-run' ? 'Skip Identity For Now' : 'Close Identity Hub'}
-        closeHint={mode === 'first-run' ? 'Continue First-Run Setup without an agent identity' : 'Return to chat without retrying'}
+        closeLabel="Close"
         onBack={backStep => setStep(backStep)}
-        onClose={closeHub}
+        onClose={closeManager}
       />
     )
   }

package/src/identity/{hub → manager}/Routes.tsx

@@ -4,10 +4,10 @@ import { getAddress, isAddress } from 'viem'
 import { Surface } from '../../ui/Surface.js'
 import { Select } from '../../ui/Select.js'
 import { theme } from '../../ui/theme.js'
-import type { SelectableNetwork } from '../../storage/config.js'
+import type { EthagentIdentity, SelectableNetwork } from '../../storage/config.js'
 import { copyToClipboard } from '../../utils/clipboard.js'
 import { DEFAULT_IPFS_API_URL } from '../storage/ipfs.js'
-import { chainIdForNetwork, erc8004ConfigForSupportedChain } from '../registry/erc8004.js'
+import { chainIdForNetwork, erc8004ConfigForSupportedChain, type Erc8004AgentCandidate } from '../registry/erc8004.js'
 import { shortAddress } from './shared/model/format.js'
 import { canRestoreCandidate } from './restore/discover.js'
 import {
@@ -31,16 +31,16 @@ import {
   isTokenTransferStep,
 } from './transfer/TokenTransferFlow.js'
 import {
-  chainLabel,
   isCreateStep,
   isRestoreStep,
 } from './shared/utils.js'
-import { IdentityHubOperationalRoutes } from './OperationalRoutes.js'
-import type { IdentityHubController } from './useIdentityHubController.js'
+import { localChangeStatusView } from './continuity/state.js'
+import { IdentityManagerOperationalRoutes } from './OperationalRoutes.js'
+import type { IdentityManagerController } from './useController.js'
+import type { Step } from './reducer.js'
 
-export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }> = ({ controller }) => {
+export const IdentityManagerRoutes: React.FC<{ controller: IdentityManagerController }> = ({ controller }) => {
   const {
-    mode,
     config,
     onComplete,
     onConfigChange,
@@ -56,7 +56,7 @@ export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }>
     workingStatus,
     setStep,
     back,
-    closeHub,
+    closeManager,
     setCopyNotice,
     handleStepError,
     resolveRegistryForIdentity,
@@ -66,30 +66,40 @@ export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }>
   } = controller
 
   const footer = <Text color={theme.dim}>enter select · esc back</Text>
+  const setRestoreFetchingStep = (next: Extract<Step, { kind: 'restore-fetching' }>, backStep: Step): void => {
+    if (
+      isSameLoadedAgent(identity, next.candidate)
+      && localChangeStatusView(workingStatus).hasLocalChanges
+    ) {
+      setStep({ kind: 'continuity-overwrite-confirm', action: 'restore', next, back: backStep })
+      return
+    }
+    setStep(next)
+  }
 
   if (step.kind === 'first-run-ens-prompt') {
     const tokenLabel = step.identity.agentId ? `#${step.identity.agentId}` : ''
     return (
       <Surface
-        title="Token Minted"
-        subtitle={`Agent token ${tokenLabel} is live on ${chainLabel(step.registry.chainId)}. Optional next step: link an ENS subdomain so others find this agent by name.`}
+        title={step.origin === 'restore' ? 'Agent Restored' : 'Token Minted'}
+        subtitle={`${tokenLabel} is live. Optional: link an ENS name.`}
         footer={footer}
       >
         <Box flexDirection="column">
-          <Text color={theme.textSubtle}>An ENS subdomain like agent.example.eth makes the agent discoverable without sharing a token ID. Recommended, skippable.</Text>
-          <Text color={theme.textSubtle}>The token ID + network already make the agent restorable; ENS only adds a public name.</Text>
+          <Text color={theme.textSubtle}>An ENS name like agent.you.eth gives your agent a public handle.</Text>
+          <Text color={theme.textSubtle}>Optional. The token id and network already make it restorable.</Text>
         </Box>
         <Box marginTop={1}>
-          <Select<'ens' | 'skip'>
+          <Select<'ens' | 'later'>
             options={[
               { value: 'ens', role: 'section', label: 'Set Up Now' },
-              { 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' },
+              { value: 'ens', label: 'Set Up ENS Name', hint: 'Root → Name → Apply' },
+              { value: 'later', role: 'section', label: 'Later' },
+              { value: 'later', label: 'Add ENS Later', hint: 'Name it anytime from the menu', role: 'utility' },
             ]}
-            hintLayout="inline"
+            hintLayout="below"
             onSubmit={choice => {
-              if (choice === 'skip') {
+              if (choice === 'later') {
                 finishFirstRunIdentity()
                 return
               }
@@ -97,7 +107,7 @@ export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }>
                 kind: 'edit-profile-ens',
                 identity: step.identity,
                 registry: step.registry,
-                returnTo: { kind: 'first-run-ens-prompt', identity: step.identity, registry: step.registry },
+                returnTo: { kind: 'first-run-ens-prompt', identity: step.identity, registry: step.registry, origin: step.origin },
               })
             }}
             onCancel={finishFirstRunIdentity}
@@ -110,13 +120,11 @@ export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }>
   if (step.kind === 'menu') {
     return (
       <MenuScreen
-        mode={mode}
         config={config}
         identity={identity}
-        workingStatus={workingStatus}
         canRebackup={canRebackup}
         reconciliation={reconciliation}
-        footer={footer}
+        workingStatus={workingStatus}
         onCreate={() => {
           if (identity) setStep({ kind: 'replace-confirm', next: 'create' })
           else setStep({ kind: 'create-name' })
@@ -146,8 +154,7 @@ export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }>
         onIdentityValues={() => setStep({ kind: 'details' })}
         onPrepareTransfer={openTokenTransferFlow}
         onStorage={() => setStep({ kind: 'storage-credential' })}
-        onSkip={() => onComplete({ kind: 'skip' })}
-        onCancel={closeHub}
+        onCancel={closeManager}
       />
     )
   }
@@ -162,7 +169,7 @@ export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }>
         onDescriptionSubmit={(name, description) => setStep({ kind: 'create-network', name, description })}
         onCustodySubmit={(custodyMode) => {
           if (step.kind !== 'create-custody') return
-          setStep({ kind: 'create-preflight', name: step.name, description: step.description, ...(step.network ? { network: step.network } : {}), custodyMode })
+          setStep({ kind: 'create-import', name: step.name, description: step.description, ...(step.network ? { network: step.network } : {}), custodyMode })
         }}
         onRegistrySubmit={async value => {
           if (step.kind !== 'create-registry') return
@@ -253,14 +260,14 @@ export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }>
           if (step.kind !== 'restore-select-token') return
           const candidate = step.candidates.find(item => item.agentId.toString() === value)
           if (!candidate?.backup?.cid) return
-          setStep({
+          setRestoreFetchingStep({
             kind: 'restore-fetching',
             cid: candidate.backup.cid,
             apiUrl: DEFAULT_IPFS_API_URL,
             candidate,
             requesterAddress: step.requesterAddress,
             purpose: step.purpose,
-          })
+          }, step)
         }}
         onEnsSubmit={async value => {
           if (step.kind !== 'restore-ens-input') return
@@ -275,17 +282,17 @@ export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }>
             return
           }
           if (!isAddress(step.ownerHandle, { strict: false }) || !canRestoreCandidate(resolution.candidate, getAddress(step.ownerHandle))) {
-            setStep({ ...step, busy: false, error: `${shortAddress(step.ownerHandle)} is not a operator wallet for this agent. Sign in with an approved operator wallet, or with the owner wallet that holds the token.` })
+            setStep({ ...step, busy: false, error: `${shortAddress(step.ownerHandle)} is not an operator wallet for this agent. Sign in with an approved operator wallet, or with the owner wallet that holds the token.` })
             return
           }
-          setStep({
+          setRestoreFetchingStep({
             kind: 'restore-fetching',
             cid: resolution.candidate.backup.cid,
             apiUrl: DEFAULT_IPFS_API_URL,
             candidate: resolution.candidate,
             requesterAddress: step.ownerHandle,
             purpose: step.purpose,
-          })
+          }, { ...step, busy: false, error: undefined })
         }}
         onTokenIdSubmit={async value => {
           if (step.kind !== 'restore-token-id-input') return
@@ -300,17 +307,17 @@ export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }>
             return
           }
           if (!isAddress(step.ownerHandle, { strict: false }) || !canRestoreCandidate(resolution.candidate, getAddress(step.ownerHandle))) {
-            setStep({ ...step, busy: false, error: `${shortAddress(step.ownerHandle)} is not a operator wallet for this agent. Sign in with an approved operator wallet, or with the owner wallet that holds the token.` })
+            setStep({ ...step, busy: false, error: `${shortAddress(step.ownerHandle)} is not an operator wallet for this agent. Sign in with an approved operator wallet, or with the owner wallet that holds the token.` })
             return
           }
-          setStep({
+          setRestoreFetchingStep({
             kind: 'restore-fetching',
             cid: resolution.candidate.backup.cid,
             apiUrl: DEFAULT_IPFS_API_URL,
             candidate: resolution.candidate,
             requesterAddress: step.ownerHandle,
             purpose: step.purpose,
-          })
+          }, { ...step, busy: false, error: undefined })
         }}
         onPickRecoveryMethod={choice => {
           if (step.kind !== 'restore-recovery-input' && step.kind !== 'restore-select-token') return
@@ -359,5 +366,12 @@ export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }>
     )
   }
 
-  return <IdentityHubOperationalRoutes controller={controller} footer={footer} />
+  return <IdentityManagerOperationalRoutes controller={controller} footer={footer} />
+}
+
+function isSameLoadedAgent(identity: EthagentIdentity | undefined, candidate: Erc8004AgentCandidate): boolean {
+  if (!identity?.agentId || !identity.chainId || !identity.identityRegistryAddress) return false
+  if (identity.chainId !== candidate.chainId) return false
+  if (identity.agentId !== candidate.agentId.toString()) return false
+  return identity.identityRegistryAddress.toLowerCase() === candidate.identityRegistryAddress.toLowerCase()
 }