ethagent 2.0.1 → 2.0.2

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. |
+| OperatorVault | 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 OperatorVault 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.
@@ -81,7 +81,7 @@ Custody comes in two modes. Switch between them anytime from **Custody Mode**.
 
 **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.
 
-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 OperatorVault 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.
 
@@ -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 OperatorVault 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.0.2",
   "description": "A privacy-first AI agent with a portable Ethereum identity",
   "type": "module",
   "main": "bin/ethagent.js",

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}>{'OperatorVault'.padEnd(12)}</Text>
             <Text color={theme.text}>{shortAddress(vaultAddress)}</Text>
           </Text>
         )

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

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

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

@@ -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 OperatorVault.',
       'update',
     )
   } finally {
@@ -616,10 +616,10 @@ async function assertVaultSignerCanRotateAgentUri(args: {
       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 OperatorVault 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(`OperatorVault ${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
 
@@ -632,7 +632,7 @@ async function assertVaultSignerCanRotateAgentUri(args: {
   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 OperatorVault 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/operatorVault.ts

@@ -220,7 +220,7 @@ 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 OperatorVault to rotate this agent's URI. Connect the owner wallet and run "Fix Records" or re-add this operator to grant the permission.`,
     )
   }
 
@@ -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 OperatorVault. ENS records remain owner-signed, switch to the owner wallet to update them.'
+        : 'Snapshot published onchain through the OperatorVault.'
 
       return {
         to: vaultCall.to,

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

@@ -7,14 +7,14 @@ import { readCustodyMode } from '../../model/custody.js'
 
 export class OperatorVaultUnavailableError 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.`)
+    super(`OperatorVault is not deployed for chainId ${chainId}. Switching custody mode is unavailable until a deployment is recorded.`)
     this.name = 'OperatorVaultUnavailableError'
   }
 }
 
 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 OperatorVault. Withdraw it first to prepare a transfer.')
     this.name = 'TokenInVaultError'
   }
 }

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: 'OperatorVault 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 OperatorVault. 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 OperatorVault 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 OperatorVault switch.',
       })
       options.push({
         value: 'cancel-advanced',
@@ -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 OperatorVault. 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="OperatorVault" value={shortAddress(vaultAddress)} /> : null}
           {isAdvanced ? (
             <Row
               label="Operators"
@@ -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 OperatorVault` },
               { 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 OperatorVault 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 OperatorVault 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 OperatorVault` },
             { value: 'back', role: 'section', label: 'Cancel' },
             { value: 'back', label: 'No, Go Back', hint: 'Return without changing custody', role: 'utility' },
           ]}

package/src/identity/hub/flows/custody/custodyEffects.ts

@@ -86,9 +86,9 @@ async function runVaultDeployTransactionInner(args: {
   })
   args.callbacks.onWalletReady(null)
   const client = args.publicClient ?? createErc8004PublicClient(args.registry)
-  const receipt = await awaitConfirmedReceipt(client, result.txHash, 'Operator delegation vault deploy', { kind: 'vault-deploy', chainId: args.registry.chainId })
+  const receipt = await awaitConfirmedReceipt(client, result.txHash, 'OperatorVault deploy', { kind: 'vault-deploy', chainId: args.registry.chainId })
   if (!receipt.contractAddress) {
-    throw new Error('Operator delegation vault deploy receipt is missing contractAddress; the transaction was not a contract creation')
+    throw new Error('OperatorVault deploy receipt is missing contractAddress; the transaction was not a contract creation')
   }
   const vaultAddress = getAddress(receipt.contractAddress)
   await assertVaultBytecode(client, vaultAddress, result.txHash)
@@ -114,7 +114,7 @@ async function runVaultDepositTransactionInner(args: {
 }): Promise<{ txHash: string }> {
   const { identity, registry, vaultAddress } = args
   if (!identity.agentId) {
-    throw new Error('Cannot deposit token to operator delegation vault: agent token ID is missing')
+    throw new Error('Cannot deposit token to OperatorVault: agent token ID is missing')
   }
   const tokenOwner = getAddress(identity.ownerAddress ?? identity.address)
   await assertVaultCanAcceptAgent({
@@ -152,7 +152,7 @@ async function runVaultDepositTransactionInner(args: {
   await awaitConfirmedReceipt(
     depositClient,
     result.txHash as Hex,
-    'Operator delegation vault deposit',
+    'OperatorVault deposit',
     { kind: 'vault-deposit', chainId: registry.chainId },
   )
   return { txHash: result.txHash }
@@ -179,9 +179,9 @@ async function assertVaultCanAcceptAgent(args: {
   const expectedRegistry = getAddress(args.registry.identityRegistryAddress)
   const sameAgent = heldRegistry.toLowerCase() === expectedRegistry.toLowerCase() && heldAgentId === args.agentId
   if (sameAgent) {
-    throw new Error(`Agent vault ${getAddress(args.vaultAddress)} already holds ERC-8004 token #${args.agentId.toString()}. Publish the pending update instead of depositing again.`)
+    throw new Error(`OperatorVault ${getAddress(args.vaultAddress)} already holds ERC-8004 token #${args.agentId.toString()}. Publish the pending update instead of depositing again.`)
   }
-  throw new Error(`Agent vault ${getAddress(args.vaultAddress)} already holds ERC-8004 token #${heldAgentId.toString()} for registry ${getAddress(heldRegistry)}. Deploy a fresh vault for this agent.`)
+  throw new Error(`OperatorVault ${getAddress(args.vaultAddress)} already holds ERC-8004 token #${heldAgentId.toString()} for registry ${getAddress(heldRegistry)}. Deploy a fresh vault for this agent.`)
 }
 
 export async function runVaultUnwrapTransaction(args: {
@@ -206,7 +206,7 @@ async function runVaultUnwrapTransactionInner(args: {
   const { identity, registry, vaultAddress } = args
   const targetAgentId = args.agentId ?? (identity.agentId ? BigInt(identity.agentId) : undefined)
   if (targetAgentId === undefined) {
-    throw new Error('Cannot unwrap token from operator delegation vault: agent token ID is missing')
+    throw new Error('Cannot unwrap token from OperatorVault: agent token ID is missing')
   }
   const baseState = (identity.state ?? {}) as Record<string, unknown>
   const ownerAddressRaw = readOwnerAddressField(baseState)
@@ -240,7 +240,7 @@ async function runVaultUnwrapTransactionInner(args: {
   await awaitConfirmedReceipt(
     publicClient,
     result.txHash as Hex,
-    'Operator delegation vault unwrap',
+    'OperatorVault unwrap',
     { kind: 'vault-unwrap', chainId: registry.chainId },
   )
   await confirmAgentWithdrawnFromVault({
@@ -307,7 +307,7 @@ async function runVaultWithdrawTransactionInner(args: {
   await awaitConfirmedReceipt(
     publicClient,
     result.txHash as Hex,
-    'Operator delegation vault withdraw',
+    'OperatorVault withdraw',
     { kind: 'vault-withdraw', chainId: registry.chainId },
   )
   await confirmAgentWithdrawnFromVault({

package/src/identity/hub/flows/custody/custodyFlowActions.ts

@@ -49,7 +49,7 @@ export function createCustodyFlowActions({
             }
             if (status.inVault) {
               handleStepError(
-                new Error(`Recovered operator delegation vault ${recoveredVault} holds the token, but the vault-level depositor is ${status.ownerAddress ?? 'unknown'}, not your wallet ${expectedOwnerForDiscovery}. Mid-flow recovery requires the original depositor's wallet to call vault.unwrap.`),
+                new Error(`Recovered OperatorVault ${recoveredVault} holds the token, but the vault-level depositor is ${status.ownerAddress ?? 'unknown'}, not your wallet ${expectedOwnerForDiscovery}. Mid-flow recovery requires the original depositor's wallet to call vault.unwrap.`),
                 { kind: 'custody-model', identity: currentStep.identity, registry, returnTo },
               )
               return
@@ -95,7 +95,7 @@ export function createCustodyFlowActions({
         }
         if (status.inVault) {
           handleStepError(
-            new Error(`Token is held by the operator delegation vault, but the vault-level owner is ${status.ownerAddress ?? 'unknown'}, not your wallet ${expectedOwner}. Recovery requires that wallet to call vault.unwrap.`),
+            new Error(`Token is held by the OperatorVault, but the vault-level owner is ${status.ownerAddress ?? 'unknown'}, not your wallet ${expectedOwner}. Recovery requires that wallet to call vault.unwrap.`),
             { kind: 'custody-model', identity: currentStep.identity, registry, returnTo },
           )
           return
@@ -127,7 +127,7 @@ export function createCustodyFlowActions({
     const vaultAddress = resolveOperatorVaultAddress(currentStep.identity, config?.erc8004?.operatorVaults)
     if (!vaultAddress) {
       handleStepError(
-        new Error('No agent vault is recorded for this identity. There is nothing to withdraw.'),
+        new Error('No OperatorVault is recorded for this identity. There is nothing to withdraw.'),
         { kind: 'custody-model', identity: currentStep.identity, registry: currentStep.registry, returnTo },
       )
       return
@@ -160,7 +160,7 @@ export function createCustodyFlowActions({
         if (status.inVault) {
           if (status.ownerAddress && status.ownerAddress.toLowerCase() !== depositor.toLowerCase()) {
             handleStepError(
-              new Error(`Agent vault holds token #${activeAgentId} but recorded the depositor as ${status.ownerAddress}, not your wallet ${depositor}. Only the original depositor can withdraw.`),
+              new Error(`OperatorVault holds token #${activeAgentId} but recorded the depositor as ${status.ownerAddress}, not your wallet ${depositor}. Only the original depositor can withdraw.`),
               { kind: 'custody-model', identity: currentStep.identity, registry: currentStep.registry, returnTo },
             )
             return
@@ -176,7 +176,7 @@ export function createCustodyFlowActions({
           return
         }
         handleStepError(
-          new Error(`Token #${activeAgentId} is not currently in the agent vault. There is nothing to withdraw; the token is already with the owner wallet.`),
+          new Error(`Token #${activeAgentId} is not currently in the OperatorVault. There is nothing to withdraw; the token is already with the owner wallet.`),
           { kind: 'custody-model', identity: currentStep.identity, registry: currentStep.registry, returnTo },
         )
       } catch (err: unknown) {

package/src/identity/hub/flows/custody/custodyFlowEffects.ts

@@ -25,7 +25,7 @@ export function useCustodyTransactionEffects({
     let cancelled = false
     if (!step.identity.agentId) {
       handleStepError(
-        new Error('Cannot deploy agent vault: agent token ID is missing'),
+        new Error('Cannot deploy OperatorVault: agent token ID is missing'),
         { kind: 'custody-model', identity: step.identity, registry: step.registry, returnTo: step.returnTo },
       )
       return () => { cancelled = true }

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

@@ -24,7 +24,7 @@ export function renderCustodyStep({
   if (step.kind === 'custody-vault-deploy-tx') {
     return (
       <WalletApprovalScreen
-        title="Deploy Operator Delegation Vault"
+        title="Deploy OperatorVault"
         subtitle={`Deploying a dedicated OperatorVault for this ERC-8004 token on ${chainLabel(step.registry.chainId)}.`}
         walletSession={walletSession}
         label="waiting for owner wallet transaction..."
@@ -35,8 +35,8 @@ export function renderCustodyStep({
   if (step.kind === 'custody-vault-deposit-tx') {
     return (
       <WalletApprovalScreen
-        title="Deposit Token Into Operator Delegation Vault"
-        subtitle={`Sign one ${chainLabel(step.registry.chainId)} transaction. Sends ERC-8004 token #${step.identity.agentId ?? ''} to its agent vault.`}
+        title="Deposit Token Into OperatorVault"
+        subtitle={`Sign one ${chainLabel(step.registry.chainId)} transaction. Sends ERC-8004 token #${step.identity.agentId ?? ''} to its OperatorVault.`}
         walletSession={walletSession}
         label="waiting for token-owner wallet transaction..."
         onCancel={() => setStep({ kind: 'custody-model', identity: step.identity, registry: step.registry, returnTo: step.returnTo })}
@@ -49,8 +49,8 @@ export function renderCustodyStep({
       <Surface
         title="Checking Vault"
         subtitle={targetAgentId
-          ? `Confirming the agent vault holds ERC-8004 token #${targetAgentId} on ${chainLabel(step.registry.chainId)}.`
-          : `Checking this identity's recorded agent vault on ${chainLabel(step.registry.chainId)}.`}
+          ? `Confirming the OperatorVault holds ERC-8004 token #${targetAgentId} on ${chainLabel(step.registry.chainId)}.`
+          : `Checking this identity's recorded OperatorVault on ${chainLabel(step.registry.chainId)}.`}
         footer={<Text color={theme.dim}>esc cancel</Text>}
       >
         <Box marginTop={1}>
@@ -64,7 +64,7 @@ export function renderCustodyStep({
     return (
       <WalletApprovalScreen
         title="Withdraw Token"
-        subtitle={`Unwraps ERC-8004 token #${targetAgentId} from its agent vault to your owner wallet on ${chainLabel(step.registry.chainId)}.`}
+        subtitle={`Unwraps ERC-8004 token #${targetAgentId} from its OperatorVault to your owner wallet on ${chainLabel(step.registry.chainId)}.`}
         walletSession={walletSession}
         label="waiting for owner wallet transaction..."
         onCancel={() => setStep({ kind: 'custody-model', identity: step.identity, registry: step.registry, returnTo: step.returnTo })}
@@ -135,7 +135,7 @@ export function renderCustodyStep({
     return (
       <Surface
         title="Token Returned to Owner Wallet"
-        subtitle={`Token returned to ${shortAddress(step.recipient)} on ${chainLabel(step.registry.chainId)}. The agent vault can be reused for this token.`}
+        subtitle={`Token returned to ${shortAddress(step.recipient)} on ${chainLabel(step.registry.chainId)}. The OperatorVault can be reused for this token.`}
         footer={<Text color={theme.dim}>enter select · esc back</Text>}
       >
         <Box flexDirection="column">
@@ -149,7 +149,7 @@ export function renderCustodyStep({
           <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 agent vault. No redeploy, no operator re-add' },
+              { value: 'return-to-vault', label: 'Return Token to Vault', hint: 'Redeposit to this OperatorVault. 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' },
             ]}
@@ -167,8 +167,8 @@ export function renderCustodyStep({
   if (step.kind === 'custody-vault-unwrap-tx') {
     return (
       <WalletApprovalScreen
-        title="Unwrap Token From Agent Vault"
-        subtitle={`Sign one ${chainLabel(step.registry.chainId)} transaction. Calls the agent vault's unwrap function to return ERC-8004 token #${step.identity.agentId ?? ''} to the owner wallet.`}
+        title="Unwrap Token From OperatorVault"
+        subtitle={`Sign one ${chainLabel(step.registry.chainId)} transaction. Calls the OperatorVault unwrap function to return ERC-8004 token #${step.identity.agentId ?? ''} to the owner wallet.`}
         walletSession={walletSession}
         label="waiting for owner wallet transaction..."
         onCancel={() => setStep({ kind: 'custody-model', identity: step.identity, registry: step.registry, returnTo: step.returnTo })}
@@ -186,7 +186,7 @@ export function renderCustodyStep({
         footer={<Text color={theme.dim}>enter continues</Text>}
       >
         <Box flexDirection="column">
-          {step.vaultAddress ? <Row label="Agent Vault" value={shortAddress(step.vaultAddress)} /> : null}
+          {step.vaultAddress ? <Row label="OperatorVault" 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}>
@@ -235,5 +235,5 @@ export function renderRebackupSubtitle(
   vaultRouted: boolean,
 ): React.ReactNode {
   if (!vaultRouted) return defaultSubtitle
-  return <Text color={theme.textSubtle}>{defaultSubtitle} Routed through this token's agent vault.</Text>
+  return <Text color={theme.textSubtle}>{defaultSubtitle} Routed through this token's OperatorVault.</Text>
 }

package/src/identity/hub/flows/ens/EnsEditAdvancedScreens.tsx

@@ -89,7 +89,7 @@ export function renderAdvancedEnsPhase({
           <Box marginTop={1} flexDirection="column">
             <EnsSetupRow label="Owner wallet" value={`Holds ERC-8004 token #${agentId ?? 'unknown'} and signs ENS records.`} />
             <EnsSetupRow label="Operator wallet" value="Restores snapshots; never controls the token." />
-            <EnsSetupRow label="Token moves" value="If the token is in the operator delegation vault, withdraw it first from Custody Mode." />
+            <EnsSetupRow label="Token moves" value="If the token is in the OperatorVault, withdraw it first from Custody Mode." />
           </Box>
         </Box>
         <Box marginTop={1}>
@@ -217,7 +217,7 @@ export function renderAdvancedEnsPhase({
         <Box flexDirection="column">
           <Text color={theme.dim}>Agent ENS: <Text color={theme.text}>{label}.{rootName}</Text></Text>
           {phase.registryAction ? <Text color={theme.dim}>{advancedSubdomainStatusText(phase.registryAction)}</Text> : null}
-          <Text color={theme.dim}>Choose the operator wallet for snapshot restore access and onchain ERC-8004 URI rotation via the operator delegation vault.</Text>
+          <Text color={theme.dim}>Choose the operator wallet for snapshot restore access and onchain ERC-8004 URI rotation via the OperatorVault.</Text>
           <Text color={theme.dim}>The operator wallet has no authority over this ENS subdomain or any token transfer; the owner wallet is the sole signer for both.</Text>
           <Text color={theme.dim}>We only read the operator's address here so it can be added to the snapshot envelope and vault operator list later.</Text>
           {savedOperator ? <Text color={theme.dim}>Saved operator wallet: <Text color={theme.text}>{shortAddress(savedOperator)}</Text></Text> : null}

package/src/identity/hub/flows/ens/EnsEditReviewScreens.tsx

@@ -218,9 +218,9 @@ export const EnsSetupBlockedScreen: React.FC<EnsSetupBlockedScreenProps> = ({
             ? (
               <>
                 <Box marginTop={1} flexDirection="column">
-                  <Text color={theme.text}>To proceed: the owner wallet signs ENS records and must hold this token at setup time. Once setup is done you can deposit the token into the operator delegation vault while the ENS subdomain stays with the owner wallet.</Text>
+                  <Text color={theme.text}>To proceed: the owner wallet signs ENS records and must hold this token at setup time. Once setup is done you can deposit the token into the OperatorVault while the ENS subdomain stays with the owner wallet.</Text>
                 </Box>
-                <Text color={theme.dim}>Operator wallets have no authority on this name; they only rotate the onchain ERC-8004 URI via the operator delegation vault.</Text>
+                <Text color={theme.dim}>Operator wallets have no authority on this name; they only rotate the onchain ERC-8004 URI via the OperatorVault.</Text>
               </>
               )
             : null}

package/src/identity/hub/model/copy.ts

@@ -21,7 +21,7 @@ export function copyableIdentityFields(identity?: EthagentIdentity, config?: Eth
   const custodyMode = readCustodyMode(identity.state)
   if (custodyMode === 'advanced') {
     const vaultAddress = readIdentityStateString(identity.state, 'operatorVaultAddress')
-    if (vaultAddress) fields.push({ label: 'Agent Vault', value: vaultAddress })
+    if (vaultAddress) fields.push({ label: 'OperatorVault', value: vaultAddress })
   }
   const activeOperator = readIdentityStateString(identity.state, 'activeOperatorAddress')
   if (activeOperator) fields.push({ label: 'Operator Wallet', value: activeOperator })

package/src/identity/hub/reconciliation/agentReconciliation/ownership.ts

@@ -85,7 +85,7 @@ async function runOwnershipPreflight(args: {
       return {
         ok: false,
         reason: 'not-owned',
-        detail: `Token is held by the operator delegation vault (${directOwner.owner}). Withdraw it first.`,
+        detail: `Token is held by the OperatorVault (${directOwner.owner}). Withdraw it first.`,
         onChainOwner: directOwner.owner,
       }
     }

package/src/identity/registry/erc8004/ownership.ts

@@ -54,7 +54,7 @@ export async function validateErc8004TokenOwner(args: Erc8004RegistryConfig & {
     return {
       ok: false,
       reason: 'token-owner-lookup-failed',
-      detail: `ERC-8004 token #${args.agentId.toString()} is still reported at the operator delegation vault, but that vault record is empty. Ownership is still settling; retry shortly.`,
+      detail: `ERC-8004 token #${args.agentId.toString()} is still reported at the OperatorVault, but that vault record is empty. Ownership is still settling; retry shortly.`,
     }
   }
   if (vaultOwnerResult.kind === 'error') {
@@ -73,7 +73,7 @@ export async function validateErc8004TokenOwner(args: Erc8004RegistryConfig & {
       ok: false,
       reason: 'token-owner-mismatch',
       ownerAddress: vaultOwner,
-      detail: `ERC-8004 token #${args.agentId.toString()} is held by the operator delegation vault for ${vaultOwner}`,
+      detail: `ERC-8004 token #${args.agentId.toString()} is held by the OperatorVault for ${vaultOwner}`,
     }
   }
   return {

package/src/identity/registry/operatorVault/bytecode.ts

@@ -15,7 +15,7 @@ export class OperatorVaultBytecodeMismatchError extends Error {
     txHash?: Hex,
   ) {
     super(
-      'Deployed contract bytecode does not match the expected operator delegation vault. The deploy transaction may have been intercepted.',
+      'Deployed contract bytecode does not match the expected OperatorVault. The deploy transaction may have been intercepted.',
     )
     this.name = 'OperatorVaultBytecodeMismatchError'
     this.vaultAddress = vaultAddress

package/src/identity/registry/operatorVault/read.ts

@@ -97,7 +97,7 @@ export async function confirmAgentInVault(
   }
   if (lastErr) throw lastErr
   throw new Error(
-    `Operator delegation vault ${getAddress(args.vaultAddress)} does not hold agent token #${args.agentId.toString()} for registry ${getAddress(args.registry)} after the deposit-confirmation budget was exhausted. The deposit transaction may have been re-orged or applied to the wrong vault. Re-run the switch.`,
+    `OperatorVault ${getAddress(args.vaultAddress)} does not hold agent token #${args.agentId.toString()} for registry ${getAddress(args.registry)} after the deposit-confirmation budget was exhausted. The deposit transaction may have been re-orged or applied to the wrong vault. Re-run the switch.`,
   )
 }
 
@@ -135,7 +135,7 @@ export async function confirmAgentWithdrawnFromVault(
   }
   if (lastErr) throw lastErr
   throw new Error(
-    `Operator delegation vault ${getAddress(args.vaultAddress)} did not release agent token #${args.agentId.toString()} to ${recipient} after the withdraw-confirmation budget was exhausted. Last observed: ${lastObserved ?? 'unknown'}.`,
+    `OperatorVault ${getAddress(args.vaultAddress)} did not release agent token #${args.agentId.toString()} to ${recipient} after the withdraw-confirmation budget was exhausted. Last observed: ${lastObserved ?? 'unknown'}.`,
   )
 }
 

package/src/identity/wallet/page/copy.ts

@@ -93,7 +93,7 @@ export const PURPOSE_COPY: Record<string, PurposeCopyEntry> = {
     flowTitle: "Operator Wallet Save",
     sign: { text: "Sign With Operator Wallet", hint: "Signs the encrypted snapshot for restore access." },
     prepare: { text: "Saving Snapshot...", hint: "Keep this page open." },
-    transaction: { text: "Use Operator Wallet", hint: "Rotates the ERC-8004 token URI through the operator delegation vault." },
+    transaction: { text: "Use Operator Wallet", hint: "Rotates the ERC-8004 token URI through the OperatorVault." },
   },
   "update-snapshot-connected": {
     flowTitle: "Save Snapshot",
@@ -196,7 +196,7 @@ export const PURPOSE_COPY: Record<string, PurposeCopyEntry> = {
   "sync-operator-vault": {
     flowTitle: "Owner Wallet Required",
     prepare: { text: "Preparing Vault Operator Update...", hint: "Keep this page open." },
-    transaction: { text: "Use Owner Wallet", hint: "Updates the operator delegation vault's metadata-operator list so authorized operator wallets can rotate the agent URI." },
+    transaction: { text: "Use Owner Wallet", hint: "Updates the OperatorVault metadata-operator list so authorized operator wallets can rotate the agent URI." },
   },
   "refetch-snapshot": {
     flowTitle: "Refetch Latest Snapshot",
@@ -219,39 +219,39 @@ export const PURPOSE_COPY: Record<string, PurposeCopyEntry> = {
     transaction: { text: "Use Sender Wallet", hint: "Submits one transaction to publish the transfer snapshot to the ERC-8004 token URI." },
   },
   "deploy-agent-vault": {
-    flowTitle: "Deploy Operator Delegation Vault",
+    flowTitle: "Deploy OperatorVault",
     prepare: { text: "Preparing Vault Deploy...", hint: "Keep this page open." },
-    transaction: { text: "Use Owner Wallet", hint: "Deploys the operator delegation vault contract onchain. One-time setup per agent." },
-    errorContext: "While submitting the operator delegation vault deploy",
+    transaction: { text: "Use Owner Wallet", hint: "Deploys the OperatorVault contract onchain. One-time setup per agent." },
+    errorContext: "While submitting the OperatorVault deploy",
   },
   "deposit-agent-vault": {
     flowTitle: "Deposit Token Into Vault",
     prepare: { text: "Preparing Vault Deposit...", hint: "Keep this page open." },
-    transaction: { text: "Use Owner Wallet", hint: "Sends the agent token to the operator delegation vault so the vault can save updates on your behalf." },
-    errorContext: "While submitting the operator delegation vault deposit",
+    transaction: { text: "Use Owner Wallet", hint: "Sends the agent token to the OperatorVault so the vault can save updates on your behalf." },
+    errorContext: "While submitting the OperatorVault deposit",
   },
   "unwrap-agent-vault": {
     flowTitle: "Unwrap Token From Vault",
     prepare: { text: "Preparing Vault Unwrap...", hint: "Keep this page open." },
-    transaction: { text: "Use Owner Wallet", hint: "Returns the agent token from the operator delegation vault to your owner wallet." },
+    transaction: { text: "Use Owner Wallet", hint: "Returns the agent token from the OperatorVault to your owner wallet." },
   },
   "rotate-agent-uri-vault-owner": {
     flowTitle: "Save Update Through Vault",
     sign: { text: "Sign With Owner Wallet", hint: "Approves the new snapshot before saving onchain. No token approval." },
     prepare: { text: "Preparing Update...", hint: "Keep this page open." },
-    transaction: { text: "Use Owner Wallet", hint: "Saves your update onchain through the operator delegation vault. The vault holds your token, so updates go through it." },
+    transaction: { text: "Use Owner Wallet", hint: "Saves your update onchain through the OperatorVault. The vault holds your token, so updates go through it." },
   },
   "rotate-agent-uri-vault-operator": {
     flowTitle: "Save Update Through Vault",
     sign: { text: "Sign With Operator Wallet", hint: "Approves the new snapshot before saving onchain. No token approval." },
     prepare: { text: "Preparing Update...", hint: "Keep this page open." },
-    transaction: { text: "Use Operator Wallet", hint: "Rotates the ERC-8004 token URI through the operator delegation vault. The vault holds your token, so the operator wallet calls the vault to publish." },
+    transaction: { text: "Use Operator Wallet", hint: "Rotates the ERC-8004 token URI through the OperatorVault. The vault holds your token, so the operator wallet calls the vault to publish." },
   },
   "withdraw-vault": {
     flowTitle: "Withdraw Token From Vault",
     prepare: { text: "Preparing Token Withdrawal...", hint: "Keep this page open." },
     transaction: { text: "Use Owner Wallet", hint: "Temporarily returns the agent token from the vault to your owner wallet. Vault stays configured so you can redeposit later." },
-    errorContext: "While submitting the operator delegation vault withdraw",
+    errorContext: "While submitting the OperatorVault withdraw",
   },
   "register-root-commit": {
     flowTitle: "Commit ENS Name",

package/src/storage/config.ts

@@ -229,7 +229,7 @@ export function setConfiguredOperatorVaultAddress(
   vaultAddress: string,
 ): EthagentConfig {
   if (!config.erc8004) {
-    throw new Error('Cannot record operator delegation vault address: erc8004 registry config is not set')
+    throw new Error('Cannot record OperatorVault address: erc8004 registry config is not set')
   }
   return {
     ...config,