ethagent 2.2.0 → 2.3.0

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,

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

@@ -1,10 +1,10 @@
-import type { CustodyFlow, CustodyFlowDeps } from './custodyFlowTypes.js'
-import { createCustodyFlowActions } from './custodyFlowActions.js'
-import { useCustodyTransactionEffects } from './custodyFlowEffects.js'
+import type { CustodyFlow, CustodyFlowDeps } from './types.js'
+import { createCustodyFlowActions } from './actions.js'
+import { useCustodyTransactionEffects } from './useCustodyEffects.js'
 import {
   renderCustodyStep,
   renderRebackupSubtitle,
-} from './custodyFlowRoutes.js'
+} from './routes.js'
 
 export function useCustodyFlow(deps: CustodyFlowDeps): CustodyFlow {
   useCustodyTransactionEffects(deps)
@@ -22,4 +22,4 @@ export type {
   CustodyFlowDeps,
   GuardOwnership,
   TriggerRebackup,
-} from './custodyFlowTypes.js'
+} from './types.js'

package/src/identity/hub/{flows/ens → ens}/EnsEditAdvancedScreens.tsx

@@ -1,25 +1,25 @@
 import React from 'react'
 import { Box, Text } from 'ink'
 import { type Address } from 'viem'
-import { Surface } from '../../../../ui/Surface.js'
-import { Select } from '../../../../ui/Select.js'
-import { TextInput } from '../../../../ui/TextInput.js'
-import { Spinner } from '../../../../ui/Spinner.js'
-import { theme } from '../../../../ui/theme.js'
+import { Surface } from '../../../ui/Surface.js'
+import { Select } from '../../../ui/Select.js'
+import { TextInput } from '../../../ui/TextInput.js'
+import { Spinner } from '../../../ui/Spinner.js'
+import { theme } from '../../../ui/theme.js'
 import {
   normalizeEthDomain,
   sanitizeSubdomainPrefix,
-} from '../../../ens/ensLookup.js'
-import { isRootEthName } from '../../../ens/ensAutomation.js'
-import type { Erc8004RegistryConfig } from '../../../registry/erc8004.js'
+} from '../../ens/ensLookup.js'
+import { isRootEthName } from '../../ens/ensAutomation.js'
+import type { Erc8004RegistryConfig } from '../../registry/erc8004.js'
 import {
   type CustodyMode,
-} from '../../model/custody.js'
-import { shortAddress } from '../../model/format.js'
+} from '../custody/state.js'
+import { shortAddress } from '../shared/model/format.js'
 import {
   footerHint,
 } from './EnsEditShared.js'
-import { IdentitySummary } from '../../components/IdentitySummary.js'
+import { IdentitySummary } from '../shared/components/IdentitySummary.js'
 import {
   EnsSetupBlockedScreen,
   EnsSetupReviewScreen,
@@ -28,8 +28,8 @@ import { EscCancel } from './EnsEditRunners.js'
 import type {
   EnsEditProps,
   EnsPhase,
-} from './ensEditTypes.js'
-import type { AgentReconciliation } from '../../reconciliation/index.js'
+} from './types.js'
+import type { AgentReconciliation } from '../shared/reconciliation/index.js'
 
 type AdvancedScreenProps = {
   phase: EnsPhase

package/src/identity/hub/{flows/ens → ens}/EnsEditFlow.tsx

@@ -1,34 +1,34 @@
 import React from 'react'
 import { getAddress, type Address } from 'viem'
-import type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
+import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
 import {
   AGENT_RECORD_READ_KEY_LIST,
   buildAgentEnsRecords,
   diffRecords,
   recordsFromTextMap,
-} from '../../../ens/agentRecords.js'
+} from '../../ens/agentRecords.js'
 import {
   discoverOwnedEnsNameDetails,
   readEthagentTextRecords,
   sanitizeSubdomainPrefix,
   splitSubdomainName,
   validateAgentEnsLink,
-} from '../../../ens/ensLookup.js'
+} from '../../ens/ensLookup.js'
 import {
   preflightDeleteSubdomain,
   preflightEnsRoot,
   preflightEnsSetup,
-} from '../../../ens/ensAutomation.js'
+} from '../../ens/ensAutomation.js'
 import {
   readCustodyMode,
   readIdentityStateString,
-} from '../../model/custody.js'
+} from '../custody/state.js'
 import {
   discoveryErrorMessage,
   emptyAgentEnsRecords,
   networkLabelForChainId,
   type EnsLinkOptions,
-} from './ensEditCopy.js'
+} from './editCopy.js'
 import { rootErrorMessage } from './EnsEditShared.js'
 import { renderAdvancedEnsPhase } from './EnsEditAdvancedScreens.js'
 import { renderEnsMaintenancePhase } from './EnsEditMaintenanceScreens.js'
@@ -37,7 +37,7 @@ import type {
   DiscoveryState,
   EnsEditProps,
   EnsPhase,
-} from './ensEditTypes.js'
+} from './types.js'
 
 export type { EnsLinkOptions }
 

package/src/identity/hub/{flows/ens → ens}/EnsEditMaintenanceScreens.tsx

@@ -1,25 +1,25 @@
 import React from 'react'
 import { Box, Text } from 'ink'
 import type { Address } from 'viem'
-import { Surface } from '../../../../ui/Surface.js'
-import { Select } from '../../../../ui/Select.js'
-import { Spinner } from '../../../../ui/Spinner.js'
-import { theme } from '../../../../ui/theme.js'
-import type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
+import { Surface } from '../../../ui/Surface.js'
+import { Select } from '../../../ui/Select.js'
+import { Spinner } from '../../../ui/Spinner.js'
+import { theme } from '../../../ui/theme.js'
+import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
 import {
   type CustodyMode,
-} from '../../model/custody.js'
-import { shortAddress } from '../../model/format.js'
+} from '../custody/state.js'
+import { shortAddress } from '../shared/model/format.js'
 import {
   emptyAgentEnsRecords,
   recordsHaveCurrentValues,
   unlinkEnsLinkOptions,
-} from './ensEditCopy.js'
+} from './editCopy.js'
 import {
   EnsSetupRow,
   footerHint,
 } from './EnsEditShared.js'
-import { IdentitySummary } from '../../components/IdentitySummary.js'
+import { IdentitySummary } from '../shared/components/IdentitySummary.js'
 import { UnlinkEnsReviewScreen } from './EnsEditReviewScreens.js'
 import {
   DeleteSubdomainTxRunner,
@@ -28,7 +28,7 @@ import {
 import type {
   EnsEditProps,
   EnsPhase,
-} from './ensEditTypes.js'
+} from './types.js'
 
 type MaintenanceScreenProps = {
   phase: EnsPhase