ethagent 2.0.1 → 2.1.0

package/README.md

@@ -15,7 +15,7 @@ ethagent binds an AI agent to a wallet-owned ERC-8004 token. Soul and memory sta
 | --- | --- |
 | Owner Wallet | Holds and controls the ERC-8004 agent token. Signs custody changes and, in Simple custody, every URI rotation. |
 | Operator Wallet | Additional wallet authorized to rotate the onchain URI on behalf of the owner. Used in Advanced custody. Never receives token approval. |
-| Operator Delegation Vault | Immutable contract deployed per agent token in Advanced custody. Each new vault holds at most one ERC-8004 token. |
+| Vault | Immutable per-agent custody contract used in Advanced custody. Holds at most one ERC-8004 token. |
 | Snapshot | Encrypted bundle of SOUL.md, MEMORY.md, and session state. Pinned to IPFS; decrypts only against the owner wallet's signature. |
 | Agent URI | IPFS URI stored in the ERC-8004 `tokenURI`. Resolves to the agent's published metadata. |
 | Agent Card | Public JSON describing the agent: name, description, capabilities, and skills. Other agents fetch it for discovery. |
@@ -50,7 +50,7 @@ The Identity Hub manages everything portable about the agent:
 
 - **Public Profile** edits name, description, icon, and the Agent Card.
 - **ENS Name** links the agent to a subdomain and authorizes operator wallets to write the subdomain's records.
-- **Custody Mode** switches between Simple and Advanced by depositing the token into its agent vault or unwrapping it back out.
+- **Custody Mode** switches between Simple and Advanced by depositing the token into its Vault or unwrapping it back out.
 - **Prepare Transfer** stages a dual-wallet snapshot before sending the token externally.
 - **Refetch Latest** pulls the most recent published snapshot back to local files.
 - **Load Agent** accepts either an ENS name or a bare token ID, and loads any agent owned by or linked to the connected wallet.
@@ -79,11 +79,11 @@ Custody comes in two modes. Switch between them anytime from **Custody Mode**.
 
 **Simple** relies on one wallet to own the token, sign every snapshot save, and rotate the onchain URI directly. Use Simple when one wallet operates the agent.
 
-**Advanced** splits an owner wallet from one or more operator wallets. The **owner wallet** owns this agent's dedicated OperatorVault; one or more **operator wallets** handle routine URI rotations through that vault. Use Advanced when routine saves should not require an owner signature.
+**Advanced** splits an owner wallet from one or more operator wallets. The **owner wallet** owns this agent's dedicated Vault; one or more **operator wallets** handle routine URI rotations through that vault. Use Advanced when routine saves should not require an owner signature.
 
-Granting an operator wallet ERC-721 approval would let it rotate the URI, but that same approval also lets it transfer the token away. The agent vault holds the token instead and exposes only a URI-rotation lane for that agent. Operators never receive token approval or transfer rights, cannot touch ENS, and cannot grant rights to other operators. The owner still signs to authorize or revoke operators for the agent, withdraw the token, or transfer the agent.
+Granting an operator wallet ERC-721 approval would let it rotate the URI, but that same approval also lets it transfer the token away. The Vault holds the token instead and exposes only a URI-rotation lane for that agent. Operators never receive token approval or transfer rights, cannot touch ENS, and cannot grant rights to other operators. The owner still signs to authorize or revoke operators for the agent, withdraw the token, or transfer the agent.
 
-The vault is an immutable Foundry contract at `contracts/src/OperatorVault.sol`. New vault deployments are dedicated per agent token and reject any other token.
+The vault is an immutable Foundry contract at `contracts/src/Vault.sol`. New vault deployments are dedicated per agent token and reject any other token.
 
 ## ENS Names
 
@@ -95,7 +95,7 @@ Save the token ID + network somewhere safe. ENS records can be cleared and rebui
 
 ## Token Transfers
 
-**Prepare Token Transfer** runs before any ERC-8004 token transfer, and only when the token sits directly in your wallet. An agent in Advanced custody has to switch to Simple first from Custody Mode, which unwraps the token from its agent vault back to the owner wallet.
+**Prepare Token Transfer** runs before any ERC-8004 token transfer, and only when the token sits directly in your wallet. An agent in Advanced custody has to switch to Simple first from Custody Mode, which unwraps the token from its Vault back to the owner wallet.
 
 - sender signs snapshot access, receiver signs restore access.
 - Sender publishes the snapshot pointer to the agent URI.

package/package.json

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

package/src/chat/ChatScreen.tsx

@@ -1388,9 +1388,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
   }, [compactionUi, overlay, projectedUsageForInput, pullInFlight, pushNote, queuedInputs, runStream, showContextLimitForPrompt, streaming])
 
   const contextLine = `${config.provider} · ${formatModelDisplayName(config.provider, config.model, { maxLength: 24 })} · ${compressHome(cwd)}`
-  const tipLine = streaming
-    ? 'Tip: You can keep typing and press enter to queue the next message · shift+enter for newline'
-    : 'Tip: type /help to get started · shift+enter for newline'
+  const tipLine = 'Tip: type /help to get started · shift+enter for newline'
 
   const placeholderHints = useMemo(() => {
     if (compactionUi) return ['compaction in progress · esc to cancel']

package/src/identity/hub/OperationalRoutes.tsx

@@ -11,7 +11,7 @@ import {
 import {
   runPublicProfileStorageSubmit,
 } from './effects/publicProfile/runPublicProfileSave.js'
-import { resolveOperatorVaultAddress } from './flows/custody/custodyEffects.js'
+import { resolveVaultAddress } from './flows/custody/custodyEffects.js'
 import { WalletApprovalScreen } from './components/WalletApprovalScreen.js'
 import { RebackupStorageScreen } from './flows/continuity/RebackupStorageScreen.js'
 import { BusyScreen } from './components/BusyScreen.js'
@@ -222,14 +222,14 @@ export const IdentityHubOperationalRoutes: React.FC<IdentityHubOperationalRoutes
       <CustodyEditFlow
         step={step}
         reconciliation={reconciliation}
-        vaultAddress={resolveOperatorVaultAddress(step.identity, config?.erc8004?.operatorVaults)}
+        vaultAddress={resolveVaultAddress(step.identity, config?.erc8004?.operatorVaults)}
         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 = resolveOperatorVaultAddress(step.identity, config?.erc8004?.operatorVaults)
+          const vaultAddress = resolveVaultAddress(step.identity, config?.erc8004?.operatorVaults)
           const updates: ProfileUpdates = {
             custodyMode: 'advanced',
             ownerAddress: step.identity.ownerAddress ?? step.identity.address,

package/src/identity/hub/components/IdentitySummary.tsx

@@ -88,7 +88,7 @@ export const IdentitySummary: React.FC<IdentitySummaryProps> = ({ identity, conf
         if (!vaultAddress) return null
         return (
           <Text>
-            <Text color={theme.dim}>{'Agent Vault'.padEnd(12)}</Text>
+            <Text color={theme.dim}>{'Vault'.padEnd(12)}</Text>
             <Text color={theme.text}>{shortAddress(vaultAddress)}</Text>
           </Text>
         )

package/src/identity/hub/components/MenuScreen.tsx

@@ -91,8 +91,8 @@ export const MenuScreen: React.FC<MenuScreenProps> = ({
       : null)
 
   const walletSetupBaseHint = custodyMode === 'advanced'
-    ? 'Advanced. Owner wallet, agent vault, authorized operator wallets'
-    : 'Simple. Switch to Advanced to delegate URI rotation through a dedicated OperatorVault'
+    ? 'Advanced. Owner wallet, Vault, authorized operator wallets'
+    : 'Simple. Switch to Advanced to delegate URI rotation through a dedicated Vault'
 
   const walletSetupLabel = flags?.custodyAsterisk ? 'Custody Mode *' : 'Custody Mode'
   const walletSetupHint = flags?.custodyModeReason ?? flags?.custodyHint ?? walletSetupBaseHint

package/src/identity/hub/effects/index.ts

@@ -36,7 +36,7 @@ export {
 } from './restore/restoreEffects.js'
 export {
   assertTokenNotInVault,
-  OperatorVaultUnavailableError,
+  VaultUnavailableError,
   TokenInVaultError,
 } from './vault/preflight.js'
 export {

package/src/identity/hub/effects/profile/profileState.ts

@@ -1,17 +1,17 @@
-import { getAddress, isAddress, type Address } from 'viem'
-import type { EthagentIdentity } from '../../../../storage/config.js'
-import type { Erc8004RegistryConfig } from '../../../registry/erc8004.js'
-import { validateAgentEnsLink, type EnsValidation } from '../../../ens/ensLookup.js'
-import { clearOwnerAddressField, clearOperatorVaultAddressField, readOwnerAddressField, setOperatorVaultAddressField, setOwnerAddressField } from '../../../identityCompat.js'
-import { validateAdvancedEnsRelationship } from '../../advancedEnsValidation.js'
-import { readCustodyMode } from '../../model/custody.js'
-import { ensValidationReasonText } from '../../model/ens.js'
-import type { ProfileUpdates } from '../../identityHubReducer.js'
-import {
-  assertActiveOperatorIsApproved,
-  mergeApprovedOperatorWallets,
-  normalizeApprovedOperatorWallets,
-  upsertApprovedOperatorWallet,
+import { getAddress, isAddress, type Address } from 'viem'
+import type { EthagentIdentity } from '../../../../storage/config.js'
+import type { Erc8004RegistryConfig } from '../../../registry/erc8004.js'
+import { validateAgentEnsLink, type EnsValidation } from '../../../ens/ensLookup.js'
+import { clearOwnerAddressField, clearVaultAddressField, readOwnerAddressField, setVaultAddressField, setOwnerAddressField } from '../../../identityCompat.js'
+import { validateAdvancedEnsRelationship } from '../../advancedEnsValidation.js'
+import { readCustodyMode } from '../../model/custody.js'
+import { ensValidationReasonText } from '../../model/ens.js'
+import type { ProfileUpdates } from '../../identityHubReducer.js'
+import {
+  assertActiveOperatorIsApproved,
+  mergeApprovedOperatorWallets,
+  normalizeApprovedOperatorWallets,
+  upsertApprovedOperatorWallet,
 } from '../../operatorWallets.js'
 function ensValidationToState(validation: EnsValidation): Record<string, unknown> {
   const checkedAt = new Date().toISOString()
@@ -26,7 +26,7 @@ function ensValidationToState(validation: EnsValidation): Record<string, unknown
   }
 }
 
-export async function validateEnsForProfileUpdate(
+export async function validateEnsForProfileUpdate(
   fullName: string,
   walletAccount: Address,
   profile: ProfileUpdates,
@@ -89,11 +89,11 @@ export function applyOperatorProfileState(
   baseState: Record<string, unknown>,
 ): void {
   const operatorFieldsTouched = profile.custodyMode !== undefined
-    || profile.ownerAddress !== undefined
-    || profile.approvedOperatorWallets !== undefined
-    || profile.activeOperatorAddress !== undefined
-    || profile.operatorVaultAddress !== undefined
-    || profile.restoreAccessEpoch !== undefined
+    || profile.ownerAddress !== undefined
+    || profile.approvedOperatorWallets !== undefined
+    || profile.activeOperatorAddress !== undefined
+    || profile.operatorVaultAddress !== undefined
+    || profile.restoreAccessEpoch !== undefined
   if (!operatorFieldsTouched) return
 
   if (profile.custodyMode === 'simple') {
@@ -107,18 +107,18 @@ export function applyOperatorProfileState(
     }
     return
   }
-  if (profile.custodyMode === 'advanced') {
-    state.custodyMode = 'advanced'
-    delete state.ensMode
-  }
-
-  if (profile.operatorVaultAddress !== undefined) {
-    if (typeof profile.operatorVaultAddress === 'string' && profile.operatorVaultAddress.trim()) {
-      setOperatorVaultAddressField(state, getAddress(profile.operatorVaultAddress))
-    } else {
-      clearOperatorVaultAddressField(state)
-    }
-  }
+  if (profile.custodyMode === 'advanced') {
+    state.custodyMode = 'advanced'
+    delete state.ensMode
+  }
+
+  if (profile.operatorVaultAddress !== undefined) {
+    if (typeof profile.operatorVaultAddress === 'string' && profile.operatorVaultAddress.trim()) {
+      setVaultAddressField(state, getAddress(profile.operatorVaultAddress))
+    } else {
+      clearVaultAddressField(state)
+    }
+  }
 
   if (typeof profile.ownerAddress === 'string' && profile.ownerAddress.trim()) {
     setOwnerAddressField(state, getAddress(profile.ownerAddress))

package/src/identity/hub/effects/publicProfile/runPublicProfileSave.ts

@@ -25,9 +25,9 @@ import {
   type Erc8004RegistryConfig,
 } from '../../../registry/erc8004.js'
 import {
-  OPERATOR_VAULT_ABI,
+  VAULT_ABI,
   encodeRotateAgentURI,
-} from '../../../registry/operatorVault.js'
+} from '../../../registry/vault.js'
 import { resolveValidatedPinataJwt, savePinataJwt } from '../../../storage/pinataJwt.js'
 import {
   openBrowserWalletSession,
@@ -435,7 +435,7 @@ async function runOperatorWalletVaultPublicProfileSave(args: {
 
     await callbacks.onIdentityComplete(
       nextIdentity,
-      'Profile updated. ERC-8004 metadata published through the operator delegation vault.',
+      'Profile updated. ERC-8004 metadata published through the Vault.',
       'update',
     )
   } finally {
@@ -611,28 +611,28 @@ async function assertVaultSignerCanRotateAgentUri(args: {
   try {
     vaultOwner = getAddress(await client.readContract({
       address: vaultAddress,
-      abi: OPERATOR_VAULT_ABI,
+      abi: VAULT_ABI,
       functionName: 'agentOwner',
       args: [registryAddress, args.agentId],
     }) as Address)
   } catch (err: unknown) {
-    throw new Error(`Could not verify operator delegation vault custody for agent #${args.agentId.toString()}: ${err instanceof Error ? err.message : String(err)}`)
+    throw new Error(`Could not verify Vault custody for agent #${args.agentId.toString()}: ${err instanceof Error ? err.message : String(err)}`)
   }
   if (vaultOwner === '0x0000000000000000000000000000000000000000') {
-    throw new Error(`Operator delegation vault ${vaultAddress} does not currently hold agent token #${args.agentId.toString()}. Connect the owner wallet and run "Fix Records" or return the token to the vault before retrying.`)
+    throw new Error(`Vault ${vaultAddress} does not currently hold agent token #${args.agentId.toString()}. Connect the owner wallet and run "Fix Records" or return the token to the vault before retrying.`)
   }
   if (vaultOwner.toLowerCase() === signer.toLowerCase()) return
 
   const isOperator = await client.readContract({
     address: vaultAddress,
-    abi: OPERATOR_VAULT_ABI,
+    abi: VAULT_ABI,
     functionName: 'metadataOperators',
     args: [registryAddress, args.agentId, signer],
   }) as boolean
   if (isOperator) return
 
   throw new Error(
-    `Operator wallet ${signer} is not yet authorized on the operator delegation vault to rotate this agent's URI. Connect the owner wallet and run "Fix Records" or re-add this operator to grant the permission.`,
+    `Operator wallet ${signer} is not yet authorized on the Vault to rotate this agent's URI. Connect the owner wallet and run "Fix Records" or re-add this operator to grant the permission.`,
   )
 }
 

package/src/identity/hub/effects/rebackup/runRebackup.ts

@@ -38,7 +38,7 @@ import {
 import {
   encodeRotateAgentURI,
   isAgentInVault,
-} from '../../../registry/operatorVault.js'
+} from '../../../registry/vault.js'
 import type { Step, ProfileUpdates } from '../../identityHubReducer.js'
 import { acquireTxGuard, releaseTxGuard } from '../../txGuard.js'
 import type { EffectCallbacks } from '../types.js'
@@ -65,7 +65,7 @@ import {
   resolverSyncWarningMessage,
   syncResolverApprovalsAfterOwnerSave,
 } from '../shared/sync.js'
-import { runOperatorWalletRebackup } from './operatorVault.js'
+import { runOperatorWalletRebackup } from './vault.js'
 
 type BackupMetadata = NonNullable<EthagentIdentity['backup']>
 type PublicSkillsMetadata = NonNullable<EthagentIdentity['publicSkills']>

package/src/identity/hub/effects/rebackup/{operatorVault.ts → vault.ts}

@@ -24,9 +24,9 @@ import {
   withEthagentPointers,
 } from '../../../registry/erc8004.js'
 import {
-  OPERATOR_VAULT_ABI,
+  VAULT_ABI,
   encodeRotateAgentURI,
-} from '../../../registry/operatorVault.js'
+} from '../../../registry/vault.js'
 import {
   requestBrowserWalletSignature,
   requestBrowserWalletSignatureAndTransaction,
@@ -54,7 +54,7 @@ import { markCurrentContinuityFilesPublished } from '../shared/sync.js'
 type BackupMetadata = NonNullable<EthagentIdentity['backup']>
 type PublicSkillsMetadata = NonNullable<EthagentIdentity['publicSkills']>
 
-type OperatorVaultPublishPrepared = {
+type VaultPublishPrepared = {
   nextIdentity: EthagentIdentity
   markdownScaffold?: IdentityMarkdownScaffold
   completionMessage: string
@@ -210,7 +210,7 @@ async function runOperatorWalletVaultPublish(args: {
   const probeClient = createErc8004PublicClient(step.registry)
   const isOperator = await probeClient.readContract({
     address: vaultAddress,
-    abi: OPERATOR_VAULT_ABI,
+    abi: VAULT_ABI,
     functionName: 'metadataOperators',
     args: [
       getAddress(step.registry.identityRegistryAddress),
@@ -220,11 +220,11 @@ async function runOperatorWalletVaultPublish(args: {
   }) as boolean
   if (!isOperator) {
     throw new Error(
-      `Operator wallet ${expectedSigner} is not yet authorized on the operator delegation vault to rotate this agent's URI. Connect the owner wallet and run "Fix Records" or re-add this operator to grant the permission.`,
+      `Operator wallet ${expectedSigner} is not yet authorized on the Vault to rotate this agent's URI. Connect the owner wallet and run "Fix Records" or re-add this operator to grant the permission.`,
     )
   }
 
-  const result = await requestBrowserWalletSignatureAndTransaction<OperatorVaultPublishPrepared>({
+  const result = await requestBrowserWalletSignatureAndTransaction<VaultPublishPrepared>({
     chainId: step.registry.chainId,
     messageForAccount: account => createWalletRestoreAccessChallenge({
       token: walletAccess.token,
@@ -344,8 +344,8 @@ async function runOperatorWalletVaultPublish(args: {
       }
 
       const completionMessage = nextEnsName !== undefined && nextEnsName !== ((step.identity.state as Record<string, unknown> | undefined)?.ensName as string | undefined)
-        ? 'Snapshot published onchain through the operator delegation vault. ENS records remain owner-signed, switch to the owner wallet to update them.'
-        : 'Snapshot published onchain through the operator delegation vault.'
+        ? 'Snapshot published onchain through the Vault. ENS records remain owner-signed, switch to the owner wallet to update them.'
+        : 'Snapshot published onchain through the Vault.'
 
       return {
         to: vaultCall.to,

package/src/identity/hub/effects/restore/apply.ts

@@ -8,7 +8,7 @@ import {
 import { ensureIdentityMarkdownScaffold, writeContinuityFiles } from '../../../continuity/storage.js'
 import { recordPublishedContinuitySnapshot } from '../../../continuity/snapshots.js'
 import { requestBrowserWalletSignature } from '../../../wallet/browserWallet.js'
-import { setOperatorVaultAddressField } from '../../../identityCompat.js'
+import { setVaultAddressField } from '../../../identityCompat.js'
 import type { Step } from '../../identityHubReducer.js'
 import type { EffectCallbacks } from '../types.js'
 import { isContinuitySnapshotEnvelope } from './envelopes.js'
@@ -76,7 +76,7 @@ export async function runRestoreAuthorize(
     ...operatorStateFromCandidate(step.candidate),
   }
   if (tokenOwnerAddress.toLowerCase() !== step.candidate.ownerAddress.toLowerCase()) {
-    setOperatorVaultAddressField(restoredState, getAddress(tokenOwnerAddress))
+    setVaultAddressField(restoredState, getAddress(tokenOwnerAddress))
   }
   const nextIdentity: EthagentIdentity = {
     source: 'erc8004',

package/src/identity/hub/effects/restore/recovery.ts

@@ -14,7 +14,7 @@ import {
   type Erc8004RegistryConfig,
 } from '../../../registry/erc8004.js'
 import { requestBrowserWalletSignature } from '../../../wallet/browserWallet.js'
-import { setOperatorVaultAddressField } from '../../../identityCompat.js'
+import { setVaultAddressField } from '../../../identityCompat.js'
 import type { EffectCallbacks } from '../types.js'
 import { isContinuitySnapshotEnvelope, parseRestorableEnvelope } from './envelopes.js'
 import { restoreMessageForWallet } from './auth.js'
@@ -98,7 +98,7 @@ export async function runRecoveryRefetch(
   }
   const tokenOwnerAddress = candidate.tokenOwnerAddress ?? candidate.ownerAddress
   if (tokenOwnerAddress.toLowerCase() !== candidate.ownerAddress.toLowerCase()) {
-    setOperatorVaultAddressField(refreshedState, getAddress(tokenOwnerAddress))
+    setVaultAddressField(refreshedState, getAddress(tokenOwnerAddress))
   }
   const nextIdentity: EthagentIdentity = {
     ...identity,

package/src/identity/hub/effects/shared/sync.ts

@@ -5,10 +5,10 @@ import {
   type Erc8004RegistryConfig,
 } from '../../../registry/erc8004.js'
 import {
-  OPERATOR_VAULT_ABI,
+  VAULT_ABI,
   encodeSetMetadataOperator,
   readMetadataOperators,
-} from '../../../registry/operatorVault.js'
+} from '../../../registry/vault.js'
 import {
   sendBrowserWalletTransaction,
   type WalletPurpose,
@@ -117,7 +117,7 @@ export async function syncVaultMetadataOperatorsAfterOwnerSave(args: {
   try {
     depositor = await probeClient.readContract({
       address: vaultAddress,
-      abi: OPERATOR_VAULT_ABI,
+      abi: VAULT_ABI,
       functionName: 'agentOwner',
       args: [registryAddress, agentId],
     }) as Address

package/src/identity/hub/effects/vault/preflight.ts

@@ -1,20 +1,20 @@
 import { getAddress, type Address, type PublicClient } from 'viem'
 import type { EthagentIdentity } from '../../../../storage/config.js'
-import { readOperatorVaultAddressField } from '../../../identityCompat.js'
+import { readVaultAddressField } from '../../../identityCompat.js'
 import { createErc8004PublicClient, type Erc8004RegistryConfig } from '../../../registry/erc8004.js'
-import { isAgentInVault, resolveConfiguredOperatorVaultAddress } from '../../../registry/operatorVault.js'
+import { isAgentInVault, resolveConfiguredVaultAddress } from '../../../registry/vault.js'
 import { readCustodyMode } from '../../model/custody.js'
 
-export class OperatorVaultUnavailableError extends Error {
+export class VaultUnavailableError extends Error {
   constructor(chainId: number) {
-    super(`Operator delegation vault is not deployed for chainId ${chainId}. Switching custody mode is unavailable until a deployment is recorded.`)
-    this.name = 'OperatorVaultUnavailableError'
+    super(`Vault is not deployed for chainId ${chainId}. Switching custody mode is unavailable until a deployment is recorded.`)
+    this.name = 'VaultUnavailableError'
   }
 }
 
 export class TokenInVaultError extends Error {
   constructor(public vaultAddress: Address) {
-    super('Token is in the operator delegation vault. Withdraw it first to prepare a transfer.')
+    super('Token is in the Vault. Withdraw it first to prepare a transfer.')
     this.name = 'TokenInVaultError'
   }
 }
@@ -42,9 +42,9 @@ function vaultAddressForTransferPreflight(
   identity: EthagentIdentity,
   operatorVaults?: Readonly<Record<string, string>>,
 ): Address | undefined {
-  const identityVault = readOperatorVaultAddressField(identity.state as Record<string, unknown> | undefined)
+  const identityVault = readVaultAddressField(identity.state as Record<string, unknown> | undefined)
   if (identityVault) return getAddress(identityVault)
   if (readCustodyMode(identity.state as Record<string, unknown> | undefined) !== 'advanced') return undefined
   if (!identity.chainId) return undefined
-  return resolveConfiguredOperatorVaultAddress(operatorVaults, identity.chainId)
+  return resolveConfiguredVaultAddress(operatorVaults, identity.chainId)
 }

package/src/identity/hub/flows/create/CreateFlow.tsx

@@ -128,7 +128,7 @@ export const CreateFlow: React.FC<CreateFlowProps> = ({
             { value: 'simple', role: 'section', label: 'Simple (Recommended)' },
             { value: 'simple', label: 'Simple', hint: 'One wallet owns the token, signs every save, and rotates the URI directly' },
             { value: 'advanced', role: 'section', label: 'Advanced' },
-            { value: 'advanced', label: 'Advanced', hint: 'Operator delegation vault holds the token; owner wallet controls vault, operator wallets get URI-rotation permission' },
+            { value: 'advanced', label: 'Advanced', hint: 'Vault holds the token; owner wallet controls vault, operator wallets get URI-rotation permission' },
           ]}
           hintLayout="inline"
           onSubmit={onCustodySubmit}
@@ -182,7 +182,7 @@ export const CreateFlow: React.FC<CreateFlowProps> = ({
         title={isAdvanced ? 'Connect Owner Wallet' : 'Sign in Wallet'}
         subtitle={
           isAdvanced
-            ? 'This wallet will own the agent token and control the delegation vault. Operator wallets are configured after minting.'
+            ? 'This wallet will own the agent token and control the Vault. Operator wallets are configured after minting.'
             : 'One browser flow signs, saves the IPFS backup, and submits the token transaction.'
         }
         walletSession={walletSession}

package/src/identity/hub/flows/custody/CustodyEditFlow.tsx

@@ -95,7 +95,7 @@ export const CustodyEditFlow: React.FC<CustodyEditFlowProps> = ({
     const isAdvanced = onChainCustody === 'advanced' || midFlow || custodyMode === 'advanced'
     const vaultHolds = onChainCustody === 'advanced' || midFlow
     const subtitle = midFlow
-      ? 'Advanced setup pending. This agent vault holds your token. Finish by publishing the first onchain update.'
+      ? 'Advanced setup pending. This Vault holds your token. Finish by publishing the first onchain update.'
       : 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.'
@@ -106,7 +106,7 @@ export const CustodyEditFlow: React.FC<CustodyEditFlowProps> = ({
       options.push({
         value: 'resume-advanced',
         label: 'Resume Advanced Setup',
-        hint: 'Sign once to publish onchain and finish the agent-vault switch.',
+        hint: 'Sign once to publish onchain and finish the Vault switch.',
       })
       options.push({
         value: 'cancel-advanced',
@@ -119,7 +119,7 @@ export const CustodyEditFlow: React.FC<CustodyEditFlowProps> = ({
       options.push({
         value: 'switch-advanced',
         label: 'Switch to Advanced',
-        hint: 'Deposit this token into its own OperatorVault so operator wallets can publish updates onchain.',
+        hint: 'Deposit this token into its own Vault so operator wallets can publish updates onchain.',
       })
     } else {
       if (!midFlow) {
@@ -139,7 +139,7 @@ export const CustodyEditFlow: React.FC<CustodyEditFlowProps> = ({
         options.push({
           value: 'return-to-vault',
           label: 'Return Token to Vault',
-          hint: 'Redeposit this token to its agent vault. No redeploy, no operator re-add.',
+          hint: 'Redeposit this token to its Vault. No redeploy, no operator re-add.',
         })
       }
       options.push({ value: 'manage-operator-wallets', role: 'section', label: 'Operators' })
@@ -184,7 +184,7 @@ export const CustodyEditFlow: React.FC<CustodyEditFlowProps> = ({
           })()}
           <Row label="Custody" value={modeLabel} />
           <Row label="Owner" value={shortAddress(ownerAddress || tokenOwner)} />
-          {isAdvanced && vaultAddress ? <Row label="Agent Vault" value={shortAddress(vaultAddress)} /> : null}
+          {isAdvanced && vaultAddress ? <Row label="Vault" value={shortAddress(vaultAddress)} /> : null}
           {isAdvanced ? (
             <Row
               label="Operators"
@@ -251,14 +251,14 @@ export const CustodyEditFlow: React.FC<CustodyEditFlowProps> = ({
     return (
       <Surface
         title="Switch to Advanced"
-        subtitle="Move this token into its own OperatorVault so authorized operator wallets can update this agent onchain without your signature each time."
+        subtitle="Move this token into its own Vault so authorized operator wallets can update this agent onchain without your signature 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 OperatorVault.</Text>
+          <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>
@@ -271,7 +271,7 @@ export const CustodyEditFlow: React.FC<CustodyEditFlowProps> = ({
           <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 agent vault` },
+              { 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: 'Cancel' },
@@ -300,7 +300,7 @@ export const CustodyEditFlow: React.FC<CustodyEditFlowProps> = ({
   return (
     <Surface
       title="Switch to Simple"
-      subtitle="Unwraps this ERC-8004 token from its agent vault and returns it directly to the owner wallet."
+      subtitle="Unwraps this ERC-8004 token from its Vault and returns it directly to the owner wallet."
       footer={footerHint('enter confirm · esc back')}
     >
       <Box flexDirection="column">
@@ -309,13 +309,13 @@ export const CustodyEditFlow: React.FC<CustodyEditFlowProps> = ({
         <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 agent vault's unwrap function for this token, so the owner wallet must sign the transaction.</Text>
+        <Text color={theme.textSubtle}>This switch calls the Vault unwrap function for this token, so the owner wallet must sign the transaction.</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 agent vault` },
+            { value: 'confirm', label: 'Yes, Switch to Simple', hint: `Sign with the owner wallet to unwrap ${tokenLabel} from its Vault` },
             { value: 'back', role: 'section', label: 'Cancel' },
             { value: 'back', label: 'No, Go Back', hint: 'Return without changing custody', role: 'utility' },
           ]}