ethagent 2.2.0 → 2.4.0

package/src/identity/hub/OperationalRoutes.tsx

@@ -1,33 +1,33 @@
 import React from 'react'
-import { hasPendingPublish } from './model/continuity.js'
+import { hasPendingPublish } from './continuity/state.js'
 import type { ProfileUpdates } from './identityHubReducer.js'
 import { clearPinataJwt, savePinataJwt } from '../storage/pinataJwt.js'
 import {
   runRebackupStorageSubmit,
-} from './effects/rebackup/runRebackup.js'
+} from './continuity/effects.js'
 import {
   runPublicProfileStorageSubmit,
-} from './effects/publicProfile/runPublicProfileSave.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'
-import { StorageCredentialScreen } from './flows/settings/StorageCredentialScreen.js'
+} from './profile/effects.js'
+import { resolveVaultAddress } from './custody/transactions.js'
+import { WalletApprovalScreen } from './shared/components/WalletApprovalScreen.js'
+import { RebackupStorageScreen } from './continuity/RebackupStorageScreen.js'
+import { BusyScreen } from './shared/components/BusyScreen.js'
+import { StorageCredentialScreen } from './settings/StorageCredentialScreen.js'
 import {
   PrivateContinuityScreen,
   PublicProfileScreen,
-} from './flows/continuity/ContinuityDashboardScreen.js'
-import { RecoveryConfirmScreen } from './flows/continuity/RecoveryConfirmScreen.js'
-import { SavePromptScreen } from './flows/continuity/SavePromptScreen.js'
-import { ErrorScreen } from './components/ErrorScreen.js'
-import { UnlinkedIdentityScreen } from './components/UnlinkedIdentityScreen.js'
-import { invalidateOwnershipCache } from './reconciliation/index.js'
+} from './continuity/ContinuityDashboardScreen.js'
+import { RecoveryConfirmScreen } from './continuity/RecoveryConfirmScreen.js'
+import { SavePromptScreen } from './continuity/SavePromptScreen.js'
+import { ErrorScreen } from './shared/components/ErrorScreen.js'
+import { UnlinkedIdentityScreen } from './shared/components/UnlinkedIdentityScreen.js'
+import { invalidateOwnershipCache } from './shared/reconciliation/index.js'
 import {
-  IdentityHubEnsFlow,
-  isIdentityHubEnsStep,
-} from './flows/ens/IdentityHubEnsFlow.js'
-import { CustodyEditFlow, isCustodyEditStep } from './flows/custody/CustodyEditFlow.js'
-import { rebackupWalletApprovalView } from './utils.js'
+  EnsFlow,
+  isEnsStep,
+} from './ens/EnsFlow.js'
+import { CustodyEditFlow, isCustodyEditStep } from './custody/CustodyEditFlow.js'
+import { rebackupWalletApprovalView } from './shared/utils.js'
 import type { IdentityHubController } from './useIdentityHubController.js'
 
 type IdentityHubOperationalRoutesProps = {
@@ -195,9 +195,9 @@ export const IdentityHubOperationalRoutes: React.FC<IdentityHubOperationalRoutes
     )
   }
 
-  if (isIdentityHubEnsStep(step)) {
+  if (isEnsStep(step)) {
     return (
-      <IdentityHubEnsFlow
+      <EnsFlow
         step={step}
         walletSession={walletSession}
         reconciliation={reconciliation}

package/src/identity/hub/Routes.tsx

@@ -8,33 +8,33 @@ import type { SelectableNetwork } from '../../storage/config.js'
 import { copyToClipboard } from '../../utils/clipboard.js'
 import { DEFAULT_IPFS_API_URL } from '../storage/ipfs.js'
 import { chainIdForNetwork, erc8004ConfigForSupportedChain } from '../registry/erc8004.js'
-import { shortAddress } from './model/format.js'
+import { shortAddress } from './shared/model/format.js'
 import {
   canRestoreCandidate,
   resolveAgentEnsToCandidate,
   resolveAgentTokenIdToCandidate,
-} from './effects/restore/index.js'
+} from './restore/index.js'
 import {
   runRegistrySubmit,
   runStorageSubmit,
-} from './effects/create.js'
+} from './create/effects.js'
 import {
   runRestoreRegistrySubmit,
-} from './effects/restoreAdmin.js'
-import { MenuScreen } from './components/MenuScreen.js'
-import { CreateFlow } from './flows/create/CreateFlow.js'
-import { RestoreFlow } from './flows/restore/RestoreFlow.js'
-import { NetworkScreen } from './components/NetworkScreen.js'
-import { DetailsScreen } from './components/DetailsScreen.js'
+} from './restore/restoreAdmin.js'
+import { MenuScreen } from './shared/components/MenuScreen.js'
+import { CreateFlow } from './create/CreateFlow.js'
+import { RestoreFlow } from './restore/RestoreFlow.js'
+import { NetworkScreen } from './shared/components/NetworkScreen.js'
+import { DetailsScreen } from './shared/components/DetailsScreen.js'
 import {
-  IdentityHubTokenTransferFlow,
+  TokenTransferFlow,
   isTokenTransferStep,
-} from './flows/token-transfer/IdentityHubTokenTransferFlow.js'
+} from './transfer/TokenTransferFlow.js'
 import {
   chainLabel,
   isCreateStep,
   isRestoreStep,
-} from './utils.js'
+} from './shared/utils.js'
 import { IdentityHubOperationalRoutes } from './OperationalRoutes.js'
 import type { IdentityHubController } from './useIdentityHubController.js'
 
@@ -345,7 +345,7 @@ export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }>
 
   if (isTokenTransferStep(step)) {
     return (
-      <IdentityHubTokenTransferFlow
+      <TokenTransferFlow
         step={step}
         callbacks={callbacks}
         footer={footer}

package/src/identity/hub/{flows/continuity → continuity}/ContinuityDashboardScreen.tsx

@@ -1,14 +1,14 @@
 import React from 'react'
 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 { EthagentConfig, EthagentIdentity } from '../../../../storage/config.js'
-import type { ContinuityWorkingTreeStatus } from '../../../continuity/storage.js'
-import { IdentitySummary } from '../../components/IdentitySummary.js'
-import { changedContinuitySnapshotFiles } from '../../model/continuity.js'
-import { readIdentityStateString } from '../../model/custody.js'
-import { shortCid } from '../../model/format.js'
+import { Surface } from '../../../ui/Surface.js'
+import { Select } from '../../../ui/Select.js'
+import { theme } from '../../../ui/theme.js'
+import type { EthagentConfig, EthagentIdentity } from '../../../storage/config.js'
+import type { ContinuityWorkingTreeStatus } from '../../continuity/storage.js'
+import { IdentitySummary } from '../shared/components/IdentitySummary.js'
+import { changedContinuitySnapshotFiles } from './state.js'
+import { readIdentityStateString } from '../custody/state.js'
+import { shortCid } from '../shared/model/format.js'
 
 type PrivateAction = 'soul' | 'memory' | 'skills' | 'export-backup' | 'back'
 type PublicAction = 'edit' | 'back'

package/src/identity/hub/{flows/continuity → continuity}/RebackupStorageScreen.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
-import { PinataJwtInput } from '../../components/PinataJwtInput.js'
-import type { Step } from '../../identityHubReducer.js'
+import { PinataJwtInput } from '../shared/components/PinataJwtInput.js'
+import type { Step } from '../identityHubReducer.js'
 
 interface RebackupStorageScreenProps {
   step: Extract<Step, { kind: 'rebackup-storage' | 'public-profile-storage' }>

package/src/identity/hub/{flows/continuity → continuity}/RecoveryConfirmScreen.tsx

@@ -1,11 +1,11 @@
 import React from 'react'
 import { Box, Text } from 'ink'
-import { Surface } from '../../../../ui/Surface.js'
-import { Select } from '../../../../ui/Select.js'
-import { theme } from '../../../../ui/theme.js'
-import { localChangeStatusView, type LocalChangeStatusView } from '../../model/continuity.js'
+import { Surface } from '../../../ui/Surface.js'
+import { Select } from '../../../ui/Select.js'
+import { theme } from '../../../ui/theme.js'
+import { localChangeStatusView, type LocalChangeStatusView } from './state.js'
 
-import type { ContinuityWorkingTreeStatus } from '../../../continuity/storage.js'
+import type { ContinuityWorkingTreeStatus } from '../../continuity/storage.js'
 
 type RecoveryConfirmMode = 'publish' | 'refetch'
 

package/src/identity/hub/{flows/continuity → continuity}/SavePromptScreen.tsx

@@ -1,10 +1,10 @@
 import React from 'react'
 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 { ContinuityWorkingTreeStatus } from '../../../continuity/storage.js'
-import { changedContinuitySnapshotFiles } from '../../model/continuity.js'
+import { Surface } from '../../../ui/Surface.js'
+import { Select } from '../../../ui/Select.js'
+import { theme } from '../../../ui/theme.js'
+import type { ContinuityWorkingTreeStatus } from '../../continuity/storage.js'
+import { changedContinuitySnapshotFiles } from './state.js'
 
 type SavePromptAction = 'save-now' | 'later'
 

package/src/identity/hub/{effects/rebackup/runRebackup.ts → continuity/effects.ts}

@@ -1,6 +1,6 @@
 import { getAddress, type Address } from 'viem'
 import type { Hex } from 'viem'
-import type { EthagentIdentity } from '../../../../storage/config.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
 import {
   continuityVaultStatus,
   prepareSyncedIdentityMarkdownScaffold,
@@ -8,47 +8,47 @@ import {
   readPublicSkillsFile,
   writeIdentityMarkdownScaffold,
   type IdentityMarkdownScaffold,
-} from '../../../continuity/storage.js'
+} from '../../continuity/storage.js'
 import {
   createWalletRestoreAccessChallenge,
   serializeContinuitySnapshotEnvelope,
   type WalletChallengePurpose,
-} from '../../../continuity/envelope.js'
+} from '../../continuity/envelope.js'
 import {
   createAgentCard,
   defaultPublicSkillsProfile,
   serializeAgentCard,
-} from '../../../continuity/publicSkills.js'
-import { recordPublishedContinuitySnapshot } from '../../../continuity/snapshots.js'
-import { addToIpfs, DEFAULT_IPFS_API_URL, isPinataUploadUrl } from '../../../storage/ipfs.js'
+} from '../../continuity/publicSkills.js'
+import { recordPublishedContinuitySnapshot } from '../../continuity/snapshots.js'
+import { addToIpfs, DEFAULT_IPFS_API_URL, isPinataUploadUrl } from '../../storage/ipfs.js'
 import {
   createErc8004PublicClient,
   encodeSetAgentUri,
   preflightSetAgentUri,
   withEthagentPointers,
   type Erc8004RegistryConfig,
-} from '../../../registry/erc8004.js'
-import { resolveValidatedPinataJwt, savePinataJwt } from '../../../storage/pinataJwt.js'
+} from '../../registry/erc8004.js'
+import { resolveValidatedPinataJwt, savePinataJwt } from '../../storage/pinataJwt.js'
 import {
   requestBrowserWalletSignatureAndTransaction,
   type BrowserWalletSession,
   type BrowserWalletSignature,
   type WalletPurpose,
-} from '../../../wallet/browserWallet.js'
+} from '../../wallet/browserWallet.js'
 import {
   encodeRotateAgentURI,
   isAgentInVault,
-} from '../../../registry/vault.js'
-import type { Step, ProfileUpdates } from '../../identityHubReducer.js'
-import { acquireTxGuard, releaseTxGuard } from '../../txGuard.js'
-import type { EffectCallbacks } from '../types.js'
-import { awaitConfirmedReceipt } from '../receipts.js'
+} from '../../registry/vault.js'
+import type { Step, ProfileUpdates } from '../identityHubReducer.js'
+import { acquireTxGuard, releaseTxGuard } from '../shared/txGuard.js'
+import type { EffectCallbacks } from '../shared/effects/types.js'
+import { awaitConfirmedReceipt } from '../shared/effects/receipts.js'
 import {
   assertVerifiedPin,
   deriveAgentName,
   prepareProfileStateForSave,
   readEnsOkFromState,
-} from '../shared/profilePrep.js'
+} from '../shared/effects/profilePrep.js'
 import {
   assertSnapshotSaveSignerAuthorized,
   createContinuityEnvelopeForSave,
@@ -58,13 +58,13 @@ import {
   resolveProfileUpdatesEpoch,
   snapshotSaveWalletRole,
   walletRestoreAccessContext,
-} from '../shared/snapshot.js'
+} from './snapshot.js'
 import {
   appendResolverSyncWarning,
   markCurrentContinuityFilesPublished,
   resolverSyncWarningMessage,
   syncVaultOperatorsAfterOwnerSave,
-} from '../shared/sync.js'
+} from '../shared/effects/sync.js'
 import { runOperatorWalletRebackup } from './vault.js'
 
 type BackupMetadata = NonNullable<EthagentIdentity['backup']>

package/src/identity/hub/{effects/rebackup → continuity}/index.ts

@@ -4,4 +4,4 @@ export {
   runRebackupSigning,
   runRebackupSigningInSession,
   runRebackupStorageSubmit,
-} from './runRebackup.js'
+} from './effects.js'

package/src/identity/hub/{effects/shared → continuity}/snapshot.ts

@@ -1,24 +1,24 @@
 import { getAddress, isAddress, type Address } from 'viem'
-import type { EthagentIdentity } from '../../../../storage/config.js'
-import type { ProfileUpdates } from '../../identityHubReducer.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
+import type { ProfileUpdates } from '../identityHubReducer.js'
 import {
   createWalletContinuitySnapshotEnvelope,
   createWalletRestoreAccessKey,
   type ContinuitySnapshotEnvelope,
   type WalletChallengePurpose,
   type WalletContinuityRestoreAccessKey,
-} from '../../../continuity/envelope.js'
+} from '../../continuity/envelope.js'
 import {
   continuityAgentSnapshot,
   defaultContinuityFiles,
-} from '../../../continuity/storage.js'
-import type { Erc8004RegistryConfig, EthagentOperatorsPointer } from '../../../registry/erc8004.js'
-import { readOwnerAddressField } from '../../../identityCompat.js'
-import { readCustodyMode } from '../../model/custody.js'
+} from '../../continuity/storage.js'
+import type { Erc8004RegistryConfig, EthagentOperatorsPointer } from '../../registry/erc8004.js'
+import { readOwnerAddressField } from '../../identityCompat.js'
+import { readCustodyMode } from '../custody/state.js'
 import {
   assertActiveOperatorIsApproved,
   normalizeApprovedOperatorWallets,
-} from '../../operatorWallets.js'
+} from '../shared/operatorWallets.js'
 
 export type WalletRestoreAccessContext = {
   token: { chainId: number; identityRegistryAddress: Address; agentId: string }

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

@@ -1,44 +1,44 @@
 import { getAddress, type Address, type Hex } from 'viem'
-import type { EthagentIdentity } from '../../../../storage/config.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
 import {
   prepareSyncedIdentityMarkdownScaffold,
   readContinuityFiles,
   readPublicSkillsFile,
   writeIdentityMarkdownScaffold,
   type IdentityMarkdownScaffold,
-} from '../../../continuity/storage.js'
+} from '../../continuity/storage.js'
 import {
   createWalletRestoreAccessChallenge,
   serializeContinuitySnapshotEnvelope,
   type WalletChallengePurpose,
-} from '../../../continuity/envelope.js'
+} from '../../continuity/envelope.js'
 import {
   createAgentCard,
   defaultPublicSkillsProfile,
   serializeAgentCard,
-} from '../../../continuity/publicSkills.js'
-import { recordPublishedContinuitySnapshot } from '../../../continuity/snapshots.js'
-import { addToIpfs, DEFAULT_IPFS_API_URL } from '../../../storage/ipfs.js'
+} from '../../continuity/publicSkills.js'
+import { recordPublishedContinuitySnapshot } from '../../continuity/snapshots.js'
+import { addToIpfs, DEFAULT_IPFS_API_URL } from '../../storage/ipfs.js'
 import {
   createErc8004PublicClient,
   withEthagentPointers,
-} from '../../../registry/erc8004.js'
+} from '../../registry/erc8004.js'
 import {
   VAULT_ABI,
   encodeRotateAgentURI,
-} from '../../../registry/vault.js'
+} from '../../registry/vault.js'
 import {
   requestBrowserWalletSignature,
   requestBrowserWalletSignatureAndTransaction,
   type WalletPurpose,
-} from '../../../wallet/browserWallet.js'
-import type { Step } from '../../identityHubReducer.js'
-import type { EffectCallbacks } from '../types.js'
-import { awaitConfirmedReceipt } from '../receipts.js'
+} from '../../wallet/browserWallet.js'
+import type { Step } from '../identityHubReducer.js'
+import type { EffectCallbacks } from '../shared/effects/types.js'
+import { awaitConfirmedReceipt } from '../shared/effects/receipts.js'
 import {
   assertVerifiedPin,
   prepareProfileStateForSave,
-} from '../shared/profilePrep.js'
+} from '../shared/effects/profilePrep.js'
 import {
   assertSnapshotSaveSignerAuthorized,
   createContinuityEnvelopeForSave,
@@ -48,8 +48,8 @@ import {
   ownerAddressForSnapshotSave,
   type WalletRestoreAccessContext,
   walletRestoreAccessContext,
-} from '../shared/snapshot.js'
-import { markCurrentContinuityFilesPublished } from '../shared/sync.js'
+} from './snapshot.js'
+import { markCurrentContinuityFilesPublished } from '../shared/effects/sync.js'
 
 type BackupMetadata = NonNullable<EthagentIdentity['backup']>
 type PublicSkillsMetadata = NonNullable<EthagentIdentity['publicSkills']>

package/src/identity/hub/{flows/create → create}/CreateFlow.tsx

@@ -1,18 +1,18 @@
 import React from 'react'
 import { Box, Text } from 'ink'
-import { Surface } from '../../../../ui/Surface.js'
-import { Select } from '../../../../ui/Select.js'
-import { TextInput } from '../../../../ui/TextInput.js'
-import { theme } from '../../../../ui/theme.js'
-import { normalizeErc8004RegistryConfig } from '../../../registry/erc8004.js'
-import { networkLabel } from '../../model/network.js'
-import type { Step } from '../../identityHubReducer.js'
-import { createStepNumber, CREATE_STEP_LABELS } from '../../identityHubReducer.js'
-import { WalletApprovalScreen } from '../../components/WalletApprovalScreen.js'
-import { BusyScreen } from '../../components/BusyScreen.js'
-import { FlowTimeline } from '../../components/FlowTimeline.js'
-import { PinataJwtInput } from '../../components/PinataJwtInput.js'
-import type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
+import { Surface } from '../../../ui/Surface.js'
+import { Select } from '../../../ui/Select.js'
+import { TextInput } from '../../../ui/TextInput.js'
+import { theme } from '../../../ui/theme.js'
+import { normalizeErc8004RegistryConfig } from '../../registry/erc8004.js'
+import { networkLabel } from '../shared/model/network.js'
+import type { Step } from '../identityHubReducer.js'
+import { createStepNumber, CREATE_STEP_LABELS } from '../identityHubReducer.js'
+import { WalletApprovalScreen } from '../shared/components/WalletApprovalScreen.js'
+import { BusyScreen } from '../shared/components/BusyScreen.js'
+import { FlowTimeline } from '../shared/components/FlowTimeline.js'
+import { PinataJwtInput } from '../shared/components/PinataJwtInput.js'
+import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
 
 type CreateFlowProps = {
   step: Extract<Step, {

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

@@ -36,11 +36,11 @@ import { setOwnerAddressField } from '../../identityCompat.js'
 import {
   requestBrowserWalletSignatureAndTransaction,
 } from '../../wallet/browserWallet.js'
-import { initialAgentState, PREFLIGHT_AGENT_URI } from '../model/identity.js'
+import { initialAgentState, PREFLIGHT_AGENT_URI } from '../profile/identity.js'
 import type { Step } from '../identityHubReducer.js'
-import type { EffectCallbacks } from './types.js'
-import { awaitConfirmedReceipt } from './receipts.js'
-import { assertVerifiedPin } from './shared/profilePrep.js'
+import type { EffectCallbacks } from '../shared/effects/types.js'
+import { awaitConfirmedReceipt } from '../shared/effects/receipts.js'
+import { assertVerifiedPin } from '../shared/effects/profilePrep.js'
 
 type BackupMetadata = NonNullable<EthagentIdentity['backup']>
 type PublicSkillsMetadata = NonNullable<EthagentIdentity['publicSkills']>

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

@@ -1,22 +1,22 @@
 import React from 'react'
 import type { Address } from 'viem'
 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 { 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 {
   displayCustodyMode,
   identityOwnerAddress,
   readCustodyMode,
   readIdentityStateString,
-} from '../../model/custody.js'
-import { ensValidationReasonText, selectEnsStatus } from '../../model/ens.js'
-import { shortAddress } from '../../model/format.js'
-import { lastBackupLabel } from '../../model/identity.js'
+} from './state.js'
+import { ensValidationReasonText, selectEnsStatus } from '../ens/state.js'
+import { shortAddress } from '../shared/model/format.js'
+import { lastBackupLabel } from '../profile/identity.js'
 import {
   type AgentReconciliation,
-} from '../../reconciliation/index.js'
+} from '../shared/reconciliation/index.js'
 
 const footerHint = (hint: string) => <Text color={theme.dim}>{hint}</Text>
 

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

@@ -1,11 +1,11 @@
 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 { createErc8004PublicClient } from '../../registry/erc8004.js'
+import { discoverPriorVaultFromTokenOwner, isAgentInVault } from '../../registry/vault.js'
+import type { ProfileUpdates, Step } from '../identityHubReducer.js'
 import { isCustodyEditStep } from './CustodyEditFlow.js'
-import { resolveVaultAddress } from './custodyEffects.js'
-import type { CustodyFlowDeps } from './custodyFlowTypes.js'
-import { humanOwnerAddress } from './custodyFlowHelpers.js'
+import { resolveVaultAddress } from './transactions.js'
+import type { CustodyFlowDeps } from './types.js'
+import { humanOwnerAddress } from './helpers.js'
 
 export function createCustodyFlowActions({
   config,

package/src/identity/hub/{flows/custody/custodyFlowHelpers.ts → custody/helpers.ts}

@@ -1,7 +1,7 @@
-import type { EthagentConfig, EthagentIdentity } from '../../../../storage/config.js'
-import { buildSeedConfigForIdentity } from '../../../../storage/config.js'
-import { readOwnerAddressField } from '../../../identityCompat.js'
-import { supportedErc8004ChainForId, type Erc8004RegistryConfig } from '../../../registry/erc8004.js'
+import type { EthagentConfig, EthagentIdentity } from '../../../storage/config.js'
+import { buildSeedConfigForIdentity } from '../../../storage/config.js'
+import { readOwnerAddressField } from '../../identityCompat.js'
+import { supportedErc8004ChainForId, type Erc8004RegistryConfig } from '../../registry/erc8004.js'
 
 export function chainLabel(chainId: number): string {
   return supportedErc8004ChainForId(chainId)?.name ?? `chain ${chainId}`

package/src/identity/hub/{effects/vault → custody}/preflight.ts

@@ -1,9 +1,9 @@
 import { getAddress, type Address, type PublicClient } from 'viem'
-import type { EthagentIdentity } from '../../../../storage/config.js'
-import { readVaultAddressField } from '../../../identityCompat.js'
-import { createErc8004PublicClient, type Erc8004RegistryConfig } from '../../../registry/erc8004.js'
-import { isAgentInVault, resolveConfiguredVaultAddress } from '../../../registry/vault.js'
-import { readCustodyMode } from '../../model/custody.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
+import { readVaultAddressField } from '../../identityCompat.js'
+import { createErc8004PublicClient, type Erc8004RegistryConfig } from '../../registry/erc8004.js'
+import { isAgentInVault, resolveConfiguredVaultAddress } from '../../registry/vault.js'
+import { readCustodyMode } from './state.js'
 
 export class VaultUnavailableError extends Error {
   constructor(chainId: number) {

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

@@ -1,13 +1,13 @@
 import React from 'react'
 import { Box, Text } from 'ink'
-import { Surface } from '../../../../ui/Surface.js'
-import { Select } from '../../../../ui/Select.js'
-import { theme } from '../../../../ui/theme.js'
-import { WalletApprovalScreen } from '../../components/WalletApprovalScreen.js'
-import { shortAddress } from '../../model/format.js'
-import type { Step } from '../../identityHubReducer.js'
-import type { CustodyFlowDeps } from './custodyFlowTypes.js'
-import { chainLabel, humanOwnerAddress } from './custodyFlowHelpers.js'
+import { Surface } from '../../../ui/Surface.js'
+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 { CustodyFlowDeps } from './types.js'
+import { chainLabel, humanOwnerAddress } from './helpers.js'
 
 const Row: React.FC<{ label: string; value: string }> = ({ label, value }) => (
   <Text>

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

@@ -8,18 +8,18 @@ import {
   VAULT_ABI,
   VAULT_DEPLOY_BYTECODE,
   assertVaultBytecode,
-} from '../../../registry/vault.js'
+} from '../../registry/vault.js'
 import {
   createErc8004PublicClient,
   type Erc8004RegistryConfig,
-} from '../../../registry/erc8004.js'
-import type { EthagentIdentity } from '../../../../storage/config.js'
-import { readVaultAddressField, readOwnerAddressField } from '../../../identityCompat.js'
-import { prepareTransactionGasFee, sendBrowserWalletTransaction } from '../../../wallet/browserWallet.js'
-import { acquireTxGuard, releaseTxGuard, type TxGuardKind } from '../../txGuard.js'
-import { awaitConfirmedReceipt } from '../../effects/receipts.js'
-import type { EffectCallbacks } from '../../effects/types.js'
-import { readCustodyMode } from '../../model/custody.js'
+} from '../../registry/erc8004.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
+import { readVaultAddressField, readOwnerAddressField } from '../../identityCompat.js'
+import { prepareTransactionGasFee, sendBrowserWalletTransaction } from '../../wallet/browserWallet.js'
+import { acquireTxGuard, releaseTxGuard, type TxGuardKind } from '../shared/txGuard.js'
+import { awaitConfirmedReceipt } from '../shared/effects/receipts.js'
+import type { EffectCallbacks } from '../shared/effects/types.js'
+import { readCustodyMode } from './state.js'
 
 export function resolveVaultAddress(
   identity: EthagentIdentity,

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

@@ -1,10 +1,10 @@
 import type React from 'react'
 import type { Address } from 'viem'
-import type { EthagentConfig, EthagentIdentity } from '../../../../storage/config.js'
-import type { Erc8004RegistryConfig } from '../../../registry/erc8004.js'
-import type { EffectCallbacks } from '../../effects/types.js'
-import type { ProfileUpdates, Step } from '../../identityHubReducer.js'
-import type { WalletApprovalScreen } from '../../components/WalletApprovalScreen.js'
+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 { WalletApprovalScreen } from '../shared/components/WalletApprovalScreen.js'
 
 export type GuardOwnership = (
   identity: EthagentIdentity,

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

@@ -1,16 +1,16 @@
 import { useEffect } from 'react'
-import { createErc8004PublicClient } from '../../../registry/erc8004.js'
-import { confirmAgentInVault } from '../../../registry/vault.js'
-import { invalidateOwnershipCache } from '../../reconciliation/index.js'
-import type { ProfileUpdates } from '../../identityHubReducer.js'
-import type { CustodyFlowDeps } from './custodyFlowTypes.js'
-import { humanOwnerAddress } from './custodyFlowHelpers.js'
+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 { CustodyFlowDeps } from './types.js'
+import { humanOwnerAddress } from './helpers.js'
 import {
   runVaultDeployTransaction,
   runVaultDepositTransaction,
   runVaultUnwrapTransaction,
   runVaultWithdrawTransaction,
-} from './custodyEffects.js'
+} from './transactions.js'
 
 export function useCustodyTransactionEffects({
   step,