ethagent 3.3.3 → 4.0.0

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

@@ -36,7 +36,8 @@ import {
   requestBrowserWalletSignatureAndTransaction,
 } from '../../wallet/browserWallet.js'
 import { initialAgentState, PREFLIGHT_AGENT_URI } from '../profile/identity.js'
-import type { Step } from '../identityHubReducer.js'
+import { mergeImportedNotes } from './importScan.js'
+import type { Step } from '../reducer.js'
 import type { EffectCallbacks } from '../shared/effects/types.js'
 import { awaitConfirmedReceipt } from '../shared/effects/receipts.js'
 import { assertVerifiedPin } from '../shared/effects/profilePrep.js'
@@ -63,8 +64,9 @@ export async function runCreatePreflight(
   const resolution = step.network
     ? registryResolutionForNetwork(step.network)
     : registryConfigFromConfig(config)
+  const carryNotes = step.importNotes ? { importNotes: step.importNotes } : {}
   if (!resolution.config) {
-    callbacks.onStep({ kind: 'create-registry', name: step.name, description: step.description, resolution, custodyMode: step.custodyMode })
+    callbacks.onStep({ kind: 'create-registry', name: step.name, description: step.description, resolution, custodyMode: step.custodyMode, ...carryNotes })
     return
   }
   const apiUrl = DEFAULT_IPFS_API_URL
@@ -79,14 +81,15 @@ export async function runCreatePreflight(
       registry: resolution.config,
       custodyMode: step.custodyMode,
       error: (err as Error).message,
+      ...carryNotes,
     })
     return
   }
   if (isPinataUploadUrl(apiUrl) && !jwt) {
-    callbacks.onStep({ kind: 'create-storage', name: step.name, description: step.description, registry: resolution.config, custodyMode: step.custodyMode })
+    callbacks.onStep({ kind: 'create-storage', name: step.name, description: step.description, registry: resolution.config, custodyMode: step.custodyMode, ...carryNotes })
     return
   }
-  callbacks.onStep({ kind: 'create-signing', name: step.name, description: step.description, registry: resolution.config, custodyMode: step.custodyMode, pinataJwt: jwt })
+  callbacks.onStep({ kind: 'create-signing', name: step.name, description: step.description, registry: resolution.config, custodyMode: step.custodyMode, pinataJwt: jwt, ...carryNotes })
 }
 
 function registryResolutionForNetwork(network: SelectableNetwork): RegistryResolution {
@@ -136,7 +139,9 @@ export async function runCreateSigning(
         registry: step.registry,
         state,
       })
-      const continuityFiles = defaultContinuityFiles(draftIdentity)
+      const continuityFiles = step.importNotes?.length
+        ? mergeImportedNotes(defaultContinuityFiles(draftIdentity), step.importNotes)
+        : defaultContinuityFiles(draftIdentity)
       const publicProfile = defaultPublicSkillsProfile(draftIdentity)
       const agentCardJson = serializeAgentCard(createAgentCard(publicProfile))
       const agentCardPin = await addToIpfs(DEFAULT_IPFS_API_URL, agentCardJson, fetch, { pinataJwt: step.pinataJwt })
@@ -231,8 +236,11 @@ export async function runCreateSigning(
     backup,
     agentCard: result.prepared.agentCard,
   }
+  const finalContinuityFiles = step.importNotes?.length
+    ? mergeImportedNotes(defaultContinuityFiles(nextIdentity), step.importNotes)
+    : defaultContinuityFiles(nextIdentity)
   await writeIdentityMarkdownScaffold(nextIdentity, {
-    ...defaultContinuityFiles(nextIdentity),
+    ...finalContinuityFiles,
     'agent-card.json': result.prepared.agentCardJson,
   })
   await recordPublishedContinuitySnapshot({ identity: nextIdentity, label: 'initial published snapshot' }).catch(() => null)
@@ -264,18 +272,19 @@ export async function runRegistrySubmit(
     onConfigChange(next)
   }
   const apiUrl = DEFAULT_IPFS_API_URL
+  const carryNotes = step.importNotes ? { importNotes: step.importNotes } : {}
   let jwt: string | undefined
   try {
     jwt = isPinataUploadUrl(apiUrl) ? await resolveValidatedPinataJwt() : undefined
   } catch (err: unknown) {
-    callbacks.onStep({ kind: 'create-storage', name: step.name, description: step.description, registry, custodyMode: step.custodyMode, error: (err as Error).message })
+    callbacks.onStep({ kind: 'create-storage', name: step.name, description: step.description, registry, custodyMode: step.custodyMode, error: (err as Error).message, ...carryNotes })
     return
   }
   if (isPinataUploadUrl(apiUrl) && !jwt) {
-    callbacks.onStep({ kind: 'create-storage', name: step.name, description: step.description, registry, custodyMode: step.custodyMode })
+    callbacks.onStep({ kind: 'create-storage', name: step.name, description: step.description, registry, custodyMode: step.custodyMode, ...carryNotes })
     return
   }
-  callbacks.onStep({ kind: 'create-signing', name: step.name, description: step.description, registry, custodyMode: step.custodyMode, pinataJwt: jwt })
+  callbacks.onStep({ kind: 'create-signing', name: step.name, description: step.description, registry, custodyMode: step.custodyMode, pinataJwt: jwt, ...carryNotes })
 }
 
 export async function runStorageSubmit(
@@ -284,7 +293,7 @@ export async function runStorageSubmit(
   callbacks: EffectCallbacks,
 ): Promise<void> {
   const { jwt: pinataJwt } = await savePinataJwt(input)
-  callbacks.onStep({ kind: 'create-signing', name: step.name, description: step.description, registry: step.registry, custodyMode: step.custodyMode, pinataJwt })
+  callbacks.onStep({ kind: 'create-signing', name: step.name, description: step.description, registry: step.registry, custodyMode: step.custodyMode, pinataJwt, ...(step.importNotes ? { importNotes: step.importNotes } : {}) })
 }
 
 function identityDraftForBackup(args: {

package/src/identity/manager/create/importScan.ts

@@ -0,0 +1,122 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import type { EthagentIdentity } from '../../../storage/config.js'
+import type { ContinuityFiles } from '../../continuity/envelope.js'
+import { defaultContinuityFiles } from '../../continuity/storage.js'
+import { extractOutsideManaged } from '../../../cli/syncAdapters/managedBlock.js'
+import { BUILT_IN_ADAPTERS } from '../../../cli/syncAdapters/index.js'
+
+export type ImportCandidate = {
+  source: string
+  raw: string
+  contentLines: number
+}
+
+const MIN_SUBSTANTIVE_CHARS = 120
+const MIN_CONTENT_LINES = 5
+
+function stripIdentityBlocks(text: string): string {
+  return text.replace(/<!--\s*ethagent:identity:start\s*-->[\s\S]*?<!--\s*ethagent:identity:end\s*-->/g, '')
+}
+
+function substantiveLines(text: string): string[] {
+  return stripIdentityBlocks(text)
+    .split('\n')
+    .map(line => line.trim())
+    .filter(line => line.length > 0)
+    .filter(line => !line.startsWith('#'))
+    .filter(line => !(line.startsWith('<!--') && line.endsWith('-->')))
+}
+
+const LEGACY_SCAFFOLD_LINES = [
+  'The standing voice, collaboration style, and behavior this agent keeps across sessions and models.',
+  '- 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>',
+  'Owner-approved working principles. Decisions that should be made the same way every time.',
+  '- <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>',
+  'What this agent must never do, regardless of how it is asked.',
+  '- <boundary: e.g., never bypass authentication or authorization checks>',
+  '- <boundary: e.g., never commit secrets to source control>',
+  'Long-lived owner preferences that survive sessions and model switches. Capture how the user works.',
+  '- 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>',
+  '- 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>',
+]
+
+const SCAFFOLD_LINES: Set<string> = (() => {
+  const scaffold = defaultContinuityFiles({
+    source: 'erc8004',
+    address: '0x0000000000000000000000000000000000000000',
+  } as EthagentIdentity)
+  return new Set([
+    ...substantiveLines(scaffold['SOUL.md']),
+    ...substantiveLines(scaffold['MEMORY.md']),
+    ...LEGACY_SCAFFOLD_LINES,
+  ])
+})()
+
+function localOnlyLines(text: string): string[] {
+  return substantiveLines(text).filter(line => !SCAFFOLD_LINES.has(line))
+}
+
+export function isValuableImport(text: string): boolean {
+  const lines = localOnlyLines(text)
+  if (lines.length === 0) return false
+  const chars = lines.join('').replace(/\s/g, '').length
+  return chars >= MIN_SUBSTANTIVE_CHARS || lines.length >= MIN_CONTENT_LINES
+}
+
+export async function scanImportCandidates(): Promise<ImportCandidate[]> {
+  const out: ImportCandidate[] = []
+  for (const adapter of BUILT_IN_ADAPTERS) {
+    if (!adapter.managedFilePaths) continue
+    const detected = await adapter.detect().catch(() => false)
+    if (!detected) continue
+    const filePath = adapter.managedFilePaths()[0]
+    if (!filePath) continue
+    let content: string
+    try {
+      content = await fs.readFile(filePath, 'utf8')
+    } catch {
+      continue
+    }
+    const outside = extractOutsideManaged(content)
+    if (!isValuableImport(outside)) continue
+    out.push({
+      source: path.basename(filePath),
+      raw: outside.trim(),
+      contentLines: localOnlyLines(outside).length,
+    })
+  }
+  return out
+}
+
+export function mergeImportedNotes(
+  base: ContinuityFiles,
+  candidates: ImportCandidate[],
+  now = new Date(),
+): ContinuityFiles {
+  if (candidates.length === 0) return base
+  const dateStr = now.toISOString().slice(0, 10)
+  const sources = candidates.map(candidate => candidate.source).join(', ')
+  const lines: string[] = [
+    `## Imported from ${sources} (${dateStr})`,
+    '',
+    'Captured from your existing assistant notes at mint time. Reorganize into the sections above as you like.',
+    '',
+  ]
+  for (const candidate of candidates) {
+    if (candidates.length > 1) lines.push(`### ${candidate.source}`, '')
+    lines.push(candidate.raw, '')
+  }
+  const importedSection = lines.join('\n').trim()
+  const memory = `${base['MEMORY.md'].replace(/\n+$/, '')}\n\n${importedSection}\n`
+  return { 'SOUL.md': base['SOUL.md'], 'MEMORY.md': memory }
+}

package/src/identity/{hub → manager}/custody/CustodyEditFlow.tsx

@@ -4,7 +4,7 @@ import { Box, Text } from 'ink'
 import { Surface } from '../../../ui/Surface.js'
 import { Select } from '../../../ui/Select.js'
 import { theme } from '../../../ui/theme.js'
-import type { ProfileUpdates, Step } from '../identityHubReducer.js'
+import type { ProfileUpdates, Step } from '../reducer.js'
 import {
   displayCustodyMode,
   identityOwnerAddress,
@@ -29,8 +29,6 @@ interface CustodyEditFlowProps {
   onSetStep: (step: Step) => void
   onSwitchToAdvanced: (returnTo: Step, profileUpdates: ProfileUpdates) => void
   onSwitchToSimple: (returnTo: Step, profileUpdates: ProfileUpdates) => void
-  onWithdrawToken: (returnTo: Step) => void
-  onReturnToVault: (returnTo: Step, vaultAddress: Address) => void
   onResumeAdvanced: (returnTo: Step) => void
   onManageOperatorWallets: () => void
   onPrepareTransfer: () => void
@@ -50,8 +48,6 @@ export const CustodyEditFlow: React.FC<CustodyEditFlowProps> = ({
   onSetStep,
   onSwitchToAdvanced,
   onSwitchToSimple,
-  onWithdrawToken,
-  onReturnToVault,
   onResumeAdvanced,
   onManageOperatorWallets,
   onPrepareTransfer,
@@ -72,68 +68,49 @@ export const CustodyEditFlow: React.FC<CustodyEditFlowProps> = ({
   const tokenOwner = identity.ownerAddress ?? identity.address
 
   if (step.kind === 'custody-model') {
-    type Action = 'switch-advanced' | 'switch-simple' | 'resume-advanced' | 'cancel-advanced' | 'withdraw-token' | 'return-to-vault' | 'manage-operator-wallets' | 'back'
+    type Action = 'switch-advanced' | 'switch-simple' | 'resume-advanced' | 'cancel-advanced' | 'manage-operator-wallets' | 'back'
     const onChainCustody = reconciliation?.custody
     const midFlow = onChainCustody === 'mid-flow-uri-pending'
     const isAdvanced = onChainCustody === 'advanced' || midFlow || custodyMode === 'advanced'
     const vaultHolds = onChainCustody === 'advanced' || midFlow
     const subtitle = midFlow
-      ? 'Advanced setup pending. This Vault holds your token. Finish by publishing the first onchain update.'
+      ? 'Advanced setup pending.'
       : isAdvanced
-        ? 'Advanced is active. Authorized operator wallets publish updates for this agent without an owner signature each time.'
-        : 'Simple is active. One wallet owns the token and signs every update.'
+        ? 'Advanced custody active.'
+        : 'Simple custody active.'
     const modeLabel = midFlow ? 'Advanced (setup pending)' : displayCustodyMode(isAdvanced ? 'advanced' : 'simple')
     const options: Array<{ value: Action; role?: 'section' | 'utility'; label: string; hint?: string }> = []
     if (midFlow) {
-      options.push({ value: 'resume-advanced', role: 'section', label: 'Resume Setup' })
       options.push({
         value: 'resume-advanced',
         label: 'Resume Advanced Setup',
-        hint: 'Sign once to publish onchain and finish the Vault switch.',
       })
       options.push({
         value: 'cancel-advanced',
         label: 'Cancel Advanced Setup',
-        hint: 'Unwrap the token back to the owner wallet and revert to simple.',
       })
     }
-    options.push({ value: 'switch-advanced', role: 'section', label: 'Custody' })
     if (!isAdvanced) {
       options.push({
         value: 'switch-advanced',
         label: 'Switch to Advanced',
-        hint: 'Deposit this token into its own Vault so operator wallets can publish updates onchain.',
+        hint: 'Operators publish',
       })
     } else {
       if (!midFlow) {
         options.push({
           value: 'switch-simple',
           label: 'Switch to Simple',
-          hint: 'Unwrap the token and revoke operator delegations.',
+          hint: 'Remove Vault',
         })
       }
-      if (vaultHolds) {
-        options.push({
-          value: 'withdraw-token',
-          label: 'Withdraw Token',
-          hint: 'Unwrap this token to the owner wallet. Vault setup stays for easy redeposit.',
-        })
-      } else if (vaultAddress) {
-        options.push({
-          value: 'return-to-vault',
-          label: 'Return Token to Vault',
-          hint: 'Redeposit this token to its Vault. No redeploy, no operator re-add.',
-        })
-      }
-      options.push({ value: 'manage-operator-wallets', role: 'section', label: 'Operators' })
       options.push({
         value: 'manage-operator-wallets',
         label: 'Manage Operators',
-        hint: 'Add or revoke wallets that can publish updates onchain.',
+        hint: 'Add or revoke',
       })
     }
-    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' })
     const notice = step.kind === 'custody-model' ? step.notice : undefined
     return (
       <Surface title="Custody Mode" subtitle={subtitle} footer={footerHint('enter select · esc back')}>
@@ -182,11 +159,6 @@ export const CustodyEditFlow: React.FC<CustodyEditFlowProps> = ({
             onSubmit={choice => {
               if (choice === 'back') return onBack()
               if (choice === 'manage-operator-wallets') return onManageOperatorWallets()
-              if (choice === 'withdraw-token') return onWithdrawToken(returnTo ?? { kind: 'menu' })
-              if (choice === 'return-to-vault') {
-                if (!vaultAddress) return
-                return onReturnToVault(returnTo ?? { kind: 'menu' }, vaultAddress)
-              }
               if (choice === 'resume-advanced') return onResumeAdvanced(returnTo ?? { kind: 'menu' })
               if (choice === 'cancel-advanced') {
                 onSetStep({ kind: 'custody-simple-confirm', identity, registry, returnTo })
@@ -213,31 +185,20 @@ export const CustodyEditFlow: React.FC<CustodyEditFlowProps> = ({
     return (
       <Surface
         title="Switch to Advanced"
-        subtitle="Move this token into its own Vault so authorized operator wallets can update this agent onchain without your signature each time."
+        subtitle="Token goes into a Vault. Operators update onchain without your sig each time."
         footer={footerHint('enter confirm · esc back')}
       >
         <Box flexDirection="column">
           <Row label="Token" value={tokenLabel} />
           {agentName ? <Row label="Name" value={agentName} /> : null}
           <Row label="Owner Wallet" value={shortAddress(ownerAddress || tokenOwner)} />
-          <Text color={theme.textSubtle}>You sign once now to deposit token #{identity.agentId ?? 'unknown'} into a dedicated Vault.</Text>
-          <Text color={theme.textSubtle}>This vault can hold only this ERC-8004 token.</Text>
-          <Text color={theme.textSubtle}>Other agent tokens use their own vaults.</Text>
-          <Text color={theme.textSubtle}>After that, operator wallets you authorize can publish updates for this agent.</Text>
-          <Box marginTop={1} flexDirection="column">
-            <Text color={theme.accentBlue}>Want a different wallet to be the owner?</Text>
-            <Text color={theme.textSubtle}>Move the token there first via Prepare Token Transfer; your continuity files come along.</Text>
-          </Box>
         </Box>
         <Box marginTop={1}>
           <Select<Action>
             options={[
-              { value: 'confirm', role: 'section', label: 'Confirm' },
-              { value: 'confirm', label: 'Yes, Switch to Advanced', hint: `Sign with ${shortAddress(ownerAddress || tokenOwner)} to deposit this token into its Vault` },
-              { value: 'transfer', role: 'section', label: 'Move Token First' },
-              { value: 'transfer', label: 'Prepare Token Transfer', hint: 'Move the token to a different wallet first, with snapshot handoff' },
-              { value: 'back', role: 'section', label: 'Navigation' },
-              { value: 'back', label: 'No, Go Back', hint: 'Return without changing custody', role: 'utility' },
+              { value: 'confirm', label: 'Yes, Switch to Advanced' },
+              { value: 'transfer', label: 'Prepare Token Transfer' },
+              { value: 'back', label: 'Back', role: 'utility' },
             ]}
             hintLayout="inline"
             onSubmit={choice => {
@@ -262,24 +223,19 @@ export const CustodyEditFlow: React.FC<CustodyEditFlowProps> = ({
   return (
     <Surface
       title="Switch to Simple"
-      subtitle="Unwraps this ERC-8004 token from its Vault and returns it directly to the owner wallet."
+      subtitle="Withdraws token from Vault to owner wallet."
       footer={footerHint('enter confirm · esc back')}
     >
       <Box flexDirection="column">
         <Row label="Token" value={tokenLabel} />
         {agentName ? <Row label="Name" value={agentName} /> : null}
-        <Text> </Text>
-        <Text color={theme.accentBlue}>Operators lose decrypt access on future snapshots immediately.</Text>
-        <Text color={theme.textSubtle}>Operator approvals are cleared from local state for future snapshots. Revoke onchain via Manage Operators first if needed.</Text>
-        <Text color={theme.textSubtle}>This switch calls the Vault unwrap function for this token, so the owner wallet must sign the transaction.</Text>
+        <Text color={theme.accentError}>Operators lose access immediately.</Text>
       </Box>
       <Box marginTop={1}>
         <Select<Action>
           options={[
-            { value: 'confirm', role: 'section', label: 'Confirm' },
-            { value: 'confirm', label: 'Yes, Switch to Simple', hint: `Sign with the owner wallet to unwrap ${tokenLabel} from its Vault` },
-            { value: 'back', role: 'section', label: 'Navigation' },
-            { value: 'back', label: 'No, Go Back', hint: 'Return without changing custody', role: 'utility' },
+            { value: 'confirm', label: 'Yes, Switch to Simple' },
+            { value: 'back', label: 'Back', role: 'utility' },
           ]}
           hintLayout="inline"
           onSubmit={choice => {

package/src/identity/{hub → manager}/custody/actions.ts

@@ -1,7 +1,7 @@
 import type { Address } from 'viem'
 import { createErc8004PublicClient } from '../../registry/erc8004.js'
 import { discoverPriorVaultFromTokenOwner, isAgentInVault } from '../../registry/vault.js'
-import type { ProfileUpdates, Step } from '../identityHubReducer.js'
+import type { ProfileUpdates, Step } from '../reducer.js'
 import { isCustodyEditStep } from './CustodyEditFlow.js'
 import { resolveVaultAddress } from './transactions.js'
 import type { CustodyFlowDeps } from './types.js'
@@ -17,7 +17,6 @@ export function createCustodyFlowActions({
   beginVaultDeposit: (currentStep: Step, returnTo: Step, profileUpdates: ProfileUpdates) => void
   beginVaultUnwrap: (currentStep: Step, returnTo: Step, profileUpdates: ProfileUpdates) => void
   beginWithdrawToken: (currentStep: Step, returnTo: Step, returnContext?: 'ens' | 'simple-exit') => void
-  beginReturnToVault: (currentStep: Step, returnTo: Step, vaultAddress: Address) => void
 } {
   const beginVaultDeposit = (currentStep: Step, returnTo: Step, profileUpdates: ProfileUpdates): void => {
     if (!isCustodyEditStep(currentStep) || currentStep.kind !== 'custody-advanced-confirm') return
@@ -210,23 +209,10 @@ export function createCustodyFlowActions({
     })()
   }
 
-  const beginReturnToVault = (currentStep: Step, returnTo: Step, vaultAddress: Address): void => {
-    if (!isCustodyEditStep(currentStep)) return
-    setStep({
-      kind: 'custody-vault-deposit-tx',
-      identity: currentStep.identity,
-      registry: currentStep.registry,
-      vaultAddress,
-      profileUpdates: withVaultProfileUpdates({}, vaultAddress),
-      returnTo,
-    })
-  }
-
   return {
     beginVaultDeposit,
     beginVaultUnwrap,
     beginWithdrawToken,
-    beginReturnToVault,
   }
 }
 

package/src/identity/{hub → manager}/custody/routes.tsx

@@ -5,7 +5,7 @@ import { Select } from '../../../ui/Select.js'
 import { theme } from '../../../ui/theme.js'
 import { WalletApprovalScreen } from '../shared/components/WalletApprovalScreen.js'
 import { shortAddress } from '../shared/model/format.js'
-import type { Step } from '../identityHubReducer.js'
+import type { Step } from '../reducer.js'
 import type { CustodyFlowDeps } from './types.js'
 import { chainLabel, humanOwnerAddress } from './helpers.js'
 
@@ -25,9 +25,9 @@ export function renderCustodyStep({
     return (
       <WalletApprovalScreen
         title="Deploy Vault"
-        subtitle={`Deploying a dedicated Vault for this ERC-8004 token on ${chainLabel(step.registry.chainId)}.`}
+        subtitle={`Deploying Vault on ${chainLabel(step.registry.chainId)}.`}
         walletSession={walletSession}
-        label="waiting for owner wallet transaction..."
+        label="waiting for wallet to deploy Vault..."
         onCancel={() => setStep({ kind: 'custody-model', identity: step.identity, registry: step.registry, returnTo: step.returnTo })}
       />
     )
@@ -36,9 +36,9 @@ export function renderCustodyStep({
     return (
       <WalletApprovalScreen
         title="Deposit Token Into Vault"
-        subtitle={`Sign one ${chainLabel(step.registry.chainId)} transaction. Sends ERC-8004 token #${step.identity.agentId ?? ''} to its Vault.`}
+        subtitle={`Depositing token #${step.identity.agentId ?? ''} into its Vault.`}
         walletSession={walletSession}
-        label="waiting for token-owner wallet transaction..."
+        label="waiting for wallet to deposit token..."
         onCancel={() => setStep({ kind: 'custody-model', identity: step.identity, registry: step.registry, returnTo: step.returnTo })}
       />
     )
@@ -49,13 +49,10 @@ export function renderCustodyStep({
       <Surface
         title="Checking Vault"
         subtitle={targetAgentId
-          ? `Confirming the Vault holds ERC-8004 token #${targetAgentId} on ${chainLabel(step.registry.chainId)}.`
+          ? `Checking Vault on ${chainLabel(step.registry.chainId)}.`
           : `Checking this identity's recorded Vault on ${chainLabel(step.registry.chainId)}.`}
         footer={<Text color={theme.dim}>esc cancel</Text>}
       >
-        <Box marginTop={1}>
-          <Text color={theme.textSubtle}>Reading vault state from onchain...</Text>
-        </Box>
       </Surface>
     )
   }
@@ -64,9 +61,9 @@ export function renderCustodyStep({
     return (
       <WalletApprovalScreen
         title="Withdraw Token"
-        subtitle={`Unwraps ERC-8004 token #${targetAgentId} from its Vault to your owner wallet on ${chainLabel(step.registry.chainId)}.`}
+        subtitle={`Withdraws token #${targetAgentId} from its Vault.`}
         walletSession={walletSession}
-        label="waiting for owner wallet transaction..."
+        label="waiting for wallet to withdraw token..."
         onCancel={() => setStep({ kind: 'custody-model', identity: step.identity, registry: step.registry, returnTo: step.returnTo })}
       />
     )
@@ -76,21 +73,19 @@ export function renderCustodyStep({
     const options = step.tokens.map(t => ({
       value: t.agentId,
       label: `Token #${t.agentId}${activeId && t.agentId === activeId ? ' (active)' : ''}`,
-      hint: 'Withdraw this token to your owner wallet',
+      hint: 'Withdraw to owner wallet',
     }))
     return (
       <Surface
         title="Pick a Vaulted Token"
-        subtitle={`Your wallet has ${step.tokens.length} vaulted tokens on ${chainLabel(step.registry.chainId)}. Pick one to withdraw.`}
+        subtitle={`${step.tokens.length} vaulted tokens on ${chainLabel(step.registry.chainId)}.`}
         footer={<Text color={theme.dim}>enter select · esc back</Text>}
       >
         <Box marginTop={1}>
           <Select<string>
             options={[
-              { value: 'header', role: 'section', label: 'Vaulted Tokens' },
               ...options,
-              { value: 'cancel', role: 'section', label: 'Navigation' },
-              { value: 'cancel', label: 'Back', hint: 'Return to Custody Mode', role: 'utility' },
+              { value: 'cancel', label: 'Back', role: 'utility' },
             ]}
             hintLayout="inline"
             onSubmit={choice => {
@@ -135,23 +130,14 @@ export function renderCustodyStep({
     return (
       <Surface
         title="Token Returned to Owner Wallet"
-        subtitle={`Token returned to ${shortAddress(step.recipient)} on ${chainLabel(step.registry.chainId)}. The Vault can be reused for this token.`}
+        subtitle={`Token returned to ${shortAddress(step.recipient)}.`}
         footer={<Text color={theme.dim}>enter select · esc back</Text>}
       >
-        <Box flexDirection="column">
-          <Text color={theme.textSubtle}>
-            {step.returnContext === 'ens'
-              ? 'Use the token with your owner wallet to set ENS records, then return it to the vault to resume Advanced custody.'
-              : 'Use the token with your owner wallet for whatever you need, then return it to the vault when finished.'}
-          </Text>
-        </Box>
         <Box marginTop={1}>
           <Select<'return-to-vault' | 'keep-out'>
             options={[
-              { value: 'return-to-vault', role: 'section', label: 'Resume Advanced Custody' },
-              { value: 'return-to-vault', label: 'Return Token to Vault', hint: 'Redeposit to this Vault. No redeploy, no operator re-add' },
-              { value: 'keep-out', role: 'section', label: 'Later' },
-              { value: 'keep-out', label: 'Keep Out For Now', hint: 'Token stays with the owner wallet; redeposit any time from Custody Mode', role: 'utility' },
+              { value: 'return-to-vault', label: 'Return Token to Vault', hint: 'Redeposit' },
+              { value: 'keep-out', label: 'Keep Out For Now', role: 'utility' },
             ]}
             hintLayout="inline"
             onSubmit={choice => {
@@ -168,9 +154,9 @@ export function renderCustodyStep({
     return (
       <WalletApprovalScreen
         title="Unwrap Token From Vault"
-        subtitle={`Sign one ${chainLabel(step.registry.chainId)} transaction. Calls the Vault unwrap function to return ERC-8004 token #${step.identity.agentId ?? ''} to the owner wallet.`}
+        subtitle={`Unwrapping token #${step.identity.agentId ?? ''} from Vault.`}
         walletSession={walletSession}
-        label="waiting for owner wallet transaction..."
+        label="waiting for wallet to unwrap token..."
         onCancel={() => setStep({ kind: 'custody-model', identity: step.identity, registry: step.registry, returnTo: step.returnTo })}
       />
     )
@@ -182,20 +168,17 @@ export function renderCustodyStep({
     return (
       <Surface
         title="Advanced Custody Active"
-        subtitle="Your token is held in its own Vault. Authorized operator wallets can rotate the agent URI onchain without owner signatures."
+        subtitle="Token held in its Vault. Operators rotate the URI onchain."
         footer={<Text color={theme.dim}>enter continues</Text>}
       >
         <Box flexDirection="column">
           {step.vaultAddress ? <Row label="Vault" value={shortAddress(step.vaultAddress)} /> : null}
           <Row label="Owner Wallet" value={shortAddress(ownerWallet)} />
           <Row label="Operator Wallets" value={operatorCount === 1 ? '1 approved' : `${operatorCount} approved`} />
-          <Box marginTop={1}>
-            <Text color={theme.textSubtle}>Use Manage Operators to add or revoke operator wallets. Use Withdraw Token to pull this token out of its vault temporarily without dismantling advanced custody.</Text>
-          </Box>
         </Box>
         <Box marginTop={1}>
           <Select<'continue'>
-            options={[{ value: 'continue', label: 'Return to Custody Mode' }]}
+            options={[{ value: 'continue', label: 'Done' }]}
             onSubmit={() => setStep({ kind: 'custody-model', identity: step.identity, registry: step.registry, returnTo: step.returnTo })}
             onCancel={() => setStep({ kind: 'custody-model', identity: step.identity, registry: step.registry, returnTo: step.returnTo })}
           />
@@ -208,18 +191,15 @@ export function renderCustodyStep({
     return (
       <Surface
         title="Simple Custody Active"
-        subtitle={`The token is back with the owner wallet. Operator slots are cleared.`}
+        subtitle="Token back in owner wallet."
         footer={<Text color={theme.dim}>enter continues</Text>}
       >
         <Box flexDirection="column">
           <Row label="Owner Wallet" value={shortAddress(ownerWallet)} />
-          <Box marginTop={1}>
-            <Text color={theme.textSubtle}>Future URI rotations require an owner wallet signature per edit. Switch back to Advanced from Custody Mode at any time.</Text>
-          </Box>
         </Box>
         <Box marginTop={1}>
           <Select<'continue'>
-            options={[{ value: 'continue', label: 'Return to Custody Mode' }]}
+            options={[{ value: 'continue', label: 'Done' }]}
             onSubmit={() => setStep({ kind: 'custody-model', identity: step.identity, registry: step.registry, returnTo: step.returnTo })}
             onCancel={() => setStep({ kind: 'custody-model', identity: step.identity, registry: step.registry, returnTo: step.returnTo })}
           />

package/src/identity/{hub → manager}/custody/transactions.ts

@@ -116,6 +116,7 @@ async function runVaultDepositTransactionInner(args: {
   if (!identity.agentId) {
     throw new Error('Cannot deposit token to Vault: agent token ID is missing')
   }
+  await assertVaultBytecode(createErc8004PublicClient(registry), vaultAddress)
   const tokenOwner = getAddress(identity.ownerAddress ?? identity.address)
   await assertVaultCanAcceptAgent({
     registry,

package/src/identity/{hub → manager}/custody/types.ts

@@ -3,7 +3,7 @@ import type { Address } from 'viem'
 import type { EthagentConfig, EthagentIdentity } from '../../../storage/config.js'
 import type { Erc8004RegistryConfig } from '../../registry/erc8004.js'
 import type { EffectCallbacks } from '../shared/effects/types.js'
-import type { ProfileUpdates, Step } from '../identityHubReducer.js'
+import type { ProfileUpdates, Step } from '../reducer.js'
 import type { WalletApprovalScreen } from '../shared/components/WalletApprovalScreen.js'
 
 export type GuardOwnership = (
@@ -36,7 +36,6 @@ export interface CustodyFlow {
   beginVaultDeposit: (currentStep: Step, returnTo: Step, profileUpdates: ProfileUpdates) => void
   beginVaultUnwrap: (currentStep: Step, returnTo: Step, profileUpdates: ProfileUpdates) => void
   beginWithdrawToken: (currentStep: Step, returnTo: Step, returnContext?: 'ens' | 'simple-exit') => void
-  beginReturnToVault: (currentStep: Step, returnTo: Step, vaultAddress: Address) => void
   renderCustodyStep: () => React.ReactElement | null
   renderRebackupSubtitle: (
     defaultSubtitle: React.ReactNode,

package/src/identity/{hub → manager}/custody/useCustodyEffects.ts

@@ -2,7 +2,7 @@ import { useEffect } from 'react'
 import { createErc8004PublicClient } from '../../registry/erc8004.js'
 import { confirmAgentInVault } from '../../registry/vault.js'
 import { invalidateOwnershipCache } from '../shared/reconciliation/index.js'
-import type { ProfileUpdates } from '../identityHubReducer.js'
+import type { ProfileUpdates } from '../reducer.js'
 import type { CustodyFlowDeps } from './types.js'
 import { humanOwnerAddress } from './helpers.js'
 import {