ethagent 2.2.0 → 2.4.0

package/src/identity/hub/{flows/settings → settings}/StorageCredentialScreen.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 { PinataJwtInput } from '../../components/PinataJwtInput.js'
-import type { Step } from '../../identityHubReducer.js'
+import { Surface } from '../../../ui/Surface.js'
+import { Select } from '../../../ui/Select.js'
+import { theme } from '../../../ui/theme.js'
+import { PinataJwtInput } from '../shared/components/PinataJwtInput.js'
+import type { Step } from '../identityHubReducer.js'
 
 type StorageCredentialAction = 'edit' | 'forget' | 'back'
 

package/src/identity/hub/{components → shared/components}/BusyScreen.tsx

@@ -1,9 +1,9 @@
 import React from 'react'
 import { Text } from 'ink'
-import { Surface } from '../../../ui/Surface.js'
-import { Spinner } from '../../../ui/Spinner.js'
-import { theme } from '../../../ui/theme.js'
-import { useAppInput } from '../../../app/input/AppInputProvider.js'
+import { Surface } from '../../../../ui/Surface.js'
+import { Spinner } from '../../../../ui/Spinner.js'
+import { theme } from '../../../../ui/theme.js'
+import { useAppInput } from '../../../../app/input/AppInputProvider.js'
 
 type BusyScreenProps = {
   title: string

package/src/identity/hub/{components → shared/components}/DetailsScreen.tsx

@@ -1,9 +1,9 @@
 import React from 'react'
 import { Box, Text } from 'ink'
-import { theme } from '../../../ui/theme.js'
-import { Surface } from '../../../ui/Surface.js'
-import { Select, type SelectOption } from '../../../ui/Select.js'
-import type { EthagentConfig, EthagentIdentity } from '../../../storage/config.js'
+import { theme } from '../../../../ui/theme.js'
+import { Surface } from '../../../../ui/Surface.js'
+import { Select, type SelectOption } from '../../../../ui/Select.js'
+import type { EthagentConfig, EthagentIdentity } from '../../../../storage/config.js'
 import { copyableIdentityFields, identityValuesCopyHint } from '../model/copy.js'
 import { IdentitySummary } from './IdentitySummary.js'
 

package/src/identity/hub/{components → shared/components}/ErrorScreen.tsx

@@ -1,10 +1,10 @@
 import React from 'react'
 import { Text } from 'ink'
-import { Surface } from '../../../ui/Surface.js'
-import { Select } from '../../../ui/Select.js'
-import { theme } from '../../../ui/theme.js'
+import { Surface } from '../../../../ui/Surface.js'
+import { Select } from '../../../../ui/Select.js'
+import { theme } from '../../../../ui/theme.js'
 import type { IdentityHubErrorView } from '../model/errors.js'
-import type { Step } from '../identityHubReducer.js'
+import type { Step } from '../../identityHubReducer.js'
 
 type ErrorScreenProps = {
   error: IdentityHubErrorView

package/src/identity/hub/{components → shared/components}/FlowTimeline.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Text } from 'ink'
-import { theme } from '../../../ui/theme.js'
+import { theme } from '../../../../ui/theme.js'
 
 type FlowTimelineProps = {
   steps: string[]

package/src/identity/hub/{components → shared/components}/IdentitySummary.tsx

@@ -1,24 +1,24 @@
 import React from 'react'
 import { Box, Text } from 'ink'
-import { theme } from '../../../ui/theme.js'
-import type { EthagentConfig, EthagentIdentity } from '../../../storage/config.js'
+import { theme } from '../../../../ui/theme.js'
+import type { EthagentConfig, EthagentIdentity } from '../../../../storage/config.js'
 import {
   displayCustodyMode,
   identityOwnerAddress,
   readCustodyMode,
   readIdentityStateString,
-} from '../model/custody.js'
+} from '../../custody/state.js'
 import {
   hasPendingPublish,
   localChangeStatusView,
   type LocalChangeStatusView,
-} from '../model/continuity.js'
-import { ensValidationReasonText, selectEnsStatus } from '../model/ens.js'
+} from '../../continuity/state.js'
+import { ensValidationReasonText, selectEnsStatus } from '../../ens/state.js'
 import { shortAddress } from '../model/format.js'
-import { identitySummaryRows, lastBackupLabel } from '../model/identity.js'
-import { transferSnapshotView, type TransferSnapshotView } from '../model/transfer.js'
+import { identitySummaryRows, lastBackupLabel } from '../../profile/identity.js'
+import { transferSnapshotView, type TransferSnapshotView } from '../../transfer/state.js'
 
-import type { ContinuityWorkingTreeStatus } from '../../continuity/storage.js'
+import type { ContinuityWorkingTreeStatus } from '../../../continuity/storage.js'
 
 interface IdentitySummaryProps {
   identity?: EthagentIdentity

package/src/identity/hub/{components → shared/components}/MenuScreen.tsx

@@ -1,13 +1,13 @@
 import React from 'react'
 import { Box, Text } from 'ink'
-import { Surface } from '../../../ui/Surface.js'
-import { Select, type SelectOption } 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 { identityPerspective, readCustodyMode } from '../model/custody.js'
+import { Surface } from '../../../../ui/Surface.js'
+import { Select, type SelectOption } 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 { identityPerspective, readCustodyMode } from '../../custody/state.js'
 import { identityValuesCopyHint } from '../model/copy.js'
-import { transferSnapshotView } from '../model/transfer.js'
+import { transferSnapshotView } from '../../transfer/state.js'
 import { IdentitySummary } from './IdentitySummary.js'
 import type { AgentReconciliation } from '../reconciliation/index.js'
 import { menuFlagsFromReconciliation } from './menuFlagsFromReconciliation.js'

package/src/identity/hub/{components → shared/components}/NetworkScreen.tsx

@@ -1,8 +1,8 @@
 import React from 'react'
-import { Surface } from '../../../ui/Surface.js'
-import { Select, type SelectOption } from '../../../ui/Select.js'
-import type { SelectableNetwork } from '../../../storage/config.js'
-import { SELECTABLE_NETWORKS } from '../../../storage/config.js'
+import { Surface } from '../../../../ui/Surface.js'
+import { Select, type SelectOption } from '../../../../ui/Select.js'
+import type { SelectableNetwork } from '../../../../storage/config.js'
+import { SELECTABLE_NETWORKS } from '../../../../storage/config.js'
 import { networkLabel, networkSubtitle } from '../model/network.js'
 
 type NetworkScreenProps = {

package/src/identity/hub/{components → shared/components}/PinataJwtInput.tsx

@@ -1,9 +1,9 @@
 import React from 'react'
 import { Text } from 'ink'
-import { Surface } from '../../../ui/Surface.js'
-import { TextInput } from '../../../ui/TextInput.js'
-import { theme } from '../../../ui/theme.js'
-import { extractPinataJwt } from '../../storage/ipfs.js'
+import { Surface } from '../../../../ui/Surface.js'
+import { TextInput } from '../../../../ui/TextInput.js'
+import { theme } from '../../../../ui/theme.js'
+import { extractPinataJwt } from '../../../storage/ipfs.js'
 
 const PINATA_API_KEYS_URL = 'https://app.pinata.cloud/developers/api-keys'
 

package/src/identity/hub/{components → shared/components}/UnlinkedIdentityScreen.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 { transferSnapshotView } from '../model/transfer.js'
-import type { EthagentIdentity } from '../../../storage/config.js'
+import { Surface } from '../../../../ui/Surface.js'
+import { Select } from '../../../../ui/Select.js'
+import { theme } from '../../../../ui/theme.js'
+import { transferSnapshotView } from '../../transfer/state.js'
+import type { EthagentIdentity } from '../../../../storage/config.js'
 
 type UnlinkedIdentityScreenProps = {
   identity?: EthagentIdentity

package/src/identity/hub/{components → shared/components}/WalletApprovalScreen.tsx

@@ -1,11 +1,11 @@
 import React from 'react'
 import { Box, Text } from 'ink'
-import { Surface } from '../../../ui/Surface.js'
-import { Spinner } from '../../../ui/Spinner.js'
-import { theme } from '../../../ui/theme.js'
-import { useAppInput } from '../../../app/input/AppInputProvider.js'
-import { openExternalUrl } from '../../../utils/openExternal.js'
-import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
+import { Surface } from '../../../../ui/Surface.js'
+import { Spinner } from '../../../../ui/Spinner.js'
+import { theme } from '../../../../ui/theme.js'
+import { useAppInput } from '../../../../app/input/AppInputProvider.js'
+import { openExternalUrl } from '../../../../utils/openExternal.js'
+import type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
 
 type WalletApprovalScreenProps = {
   title: string

package/src/identity/hub/{components → shared/components}/menuFlagsFromReconciliation.ts

@@ -1,5 +1,5 @@
 import type { AgentReconciliation } from '../reconciliation/index.js'
-import type { IdentityPerspective } from '../model/custody.js'
+import type { IdentityPerspective } from '../../custody/state.js'
 
 type MenuFlags = {
   prepareTransferDisabled: boolean

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

@@ -11,7 +11,7 @@ import {
   applyEnsValidationState,
   applyOperatorProfileState,
   validateEnsForProfileUpdate,
-} from '../profile/profileState.js'
+} from '../../profile/state.js'
 
 type PreparedProfileState = {
   state: Record<string, unknown>

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

@@ -1,6 +1,6 @@
 import type { Hex, PublicClient } from 'viem'
-import type { PendingTxKind } from '../../../storage/config.js'
-import { clearPendingTx, recordPendingTx } from '../../../storage/config.js'
+import type { PendingTxKind } from '../../../../storage/config.js'
+import { clearPendingTx, recordPendingTx } from '../../../../storage/config.js'
 
 export async function awaitConfirmedReceipt(
   client: Pick<PublicClient, 'waitForTransactionReceipt'>,

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

@@ -13,13 +13,13 @@ import { sendBrowserWalletTransaction } from '../../../wallet/browserWallet.js'
 import {
   computeApprovalDiff,
   type ApprovalDiff,
-} from '../../reconciliation/index.js'
-import { normalizeApprovedOperatorWallets } from '../../operatorWallets.js'
+} from '../reconciliation/index.js'
+import { normalizeApprovedOperatorWallets } from '../operatorWallets.js'
 import { readOwnerAddressField } from '../../../identityCompat.js'
 import { localContinuitySnapshotContentHashes } from '../../../continuity/storage.js'
 import { updatePublishedContinuitySnapshotContentHashes } from '../../../continuity/snapshots.js'
-import type { EffectCallbacks } from '../types.js'
-import { awaitConfirmedReceipt } from '../receipts.js'
+import type { EffectCallbacks } from './types.js'
+import { awaitConfirmedReceipt } from './receipts.js'
 
 export function resolverSyncWarningMessage(err: unknown): string {
   return err instanceof Error ? err.message : String(err)

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

@@ -1,7 +1,7 @@
 import type { Address } from 'viem'
-import type { EthagentIdentity } from '../../../storage/config.js'
-import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
-import type { Step } from '../identityHubReducer.js'
+import type { EthagentIdentity } from '../../../../storage/config.js'
+import type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
+import type { Step } from '../../identityHubReducer.js'
 
 export type IdentityCompletionSource = 'create' | 'restore' | 'update'
 

package/src/identity/hub/{model → shared/model}/copy.ts

@@ -1,5 +1,5 @@
-import type { EthagentConfig, EthagentIdentity } from '../../../storage/config.js'
-import { readCustodyMode, readIdentityStateString } from './custody.js'
+import type { EthagentConfig, EthagentIdentity } from '../../../../storage/config.js'
+import { readCustodyMode, readIdentityStateString } from '../../custody/state.js'
 
 type CopyableField = {
   label: string

package/src/identity/hub/{model → shared/model}/errors.ts

@@ -1,15 +1,15 @@
 import { ZodError } from 'zod'
-import { RegisterAgentPreflightError } from '../../registry/erc8004.js'
-import { AgentStateOwnerMismatchError } from '../../crypto/backupEnvelope.js'
+import { RegisterAgentPreflightError } from '../../../registry/erc8004.js'
+import { AgentStateOwnerMismatchError } from '../../../crypto/backupEnvelope.js'
 import {
   ContinuitySnapshotOwnerMismatchError,
   ContinuityTransferSnapshotTargetMismatchError,
-} from '../../continuity/envelope.js'
+} from '../../../continuity/envelope.js'
 import {
   VaultBytecodeMismatchError,
   formatVaultBytecodeMismatchDetail,
-} from '../../registry/vault.js'
-import { BrowserWalletError } from '../../wallet/browserWallet.js'
+} from '../../../registry/vault.js'
+import { BrowserWalletError } from '../../../wallet/browserWallet.js'
 import { TxGuardBusyError } from '../txGuard.js'
 import { shortAddress } from './format.js'
 

package/src/identity/hub/{model → shared/model}/network.ts

@@ -1,6 +1,6 @@
-import type { EthagentConfig, EthagentIdentity, SelectableNetwork } from '../../../storage/config.js'
-import { supportedErc8004ChainForId } from '../../registry/erc8004.js'
-import { resolveSelectedNetwork } from '../../registry/registryConfig.js'
+import type { EthagentConfig, EthagentIdentity, SelectableNetwork } from '../../../../storage/config.js'
+import { supportedErc8004ChainForId } from '../../../registry/erc8004.js'
+import { resolveSelectedNetwork } from '../../../registry/registryConfig.js'
 
 const NETWORK_LABELS: Record<SelectableNetwork, string> = {
   mainnet: 'ethereum mainnet',

package/src/identity/hub/{operatorWallets.ts → shared/operatorWallets.ts}

@@ -1,5 +1,5 @@
 import { getAddress, isAddress, type Address } from 'viem'
-import type { WalletContinuityRestoreAccessKey } from '../continuity/envelope.js'
+import type { WalletContinuityRestoreAccessKey } from '../../continuity/envelope.js'
 
 export type ApprovedOperatorWalletRecord = {
   address: Address

package/src/identity/hub/{reconciliation → shared/reconciliation}/agentReconciliation/hook.ts

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react'
-import type { EthagentConfig } from '../../../../storage/config.js'
+import type { EthagentConfig } from '../../../../../storage/config.js'
 import { emptyReconciliation, runReconciliation } from './run.js'
 import type { AgentReconciliation } from './types.js'
 

package/src/identity/hub/{reconciliation → shared/reconciliation}/agentReconciliation/ownership.ts

@@ -3,8 +3,8 @@ import {
   createErc8004PublicClient,
   validateErc8004TokenOwner,
   type Erc8004RegistryConfig,
-} from '../../../registry/erc8004.js'
-import type { EthagentIdentity } from '../../../../storage/config.js'
+} from '../../../../registry/erc8004.js'
+import type { EthagentIdentity } from '../../../../../storage/config.js'
 
 export type OwnershipRole = 'token-holder' | 'vault-level-owner'
 

package/src/identity/hub/{reconciliation → shared/reconciliation}/agentReconciliation/run.ts

@@ -4,12 +4,12 @@ import {
   erc8004ConfigForSupportedChain,
   validateErc8004TokenOwner,
   type Erc8004RegistryConfig,
-} from '../../../registry/erc8004.js'
-import { isAgentInVault, resolveConfiguredVaultAddress } from '../../../registry/vault.js'
-import type { EthagentConfig, EthagentIdentity } from '../../../../storage/config.js'
-import { readVaultAddressField } from '../../../identityCompat.js'
-import { readCustodyMode } from '../../model/custody.js'
-import { continuityWorkingTreeStatus, type ContinuityWorkingTreeStatus } from '../../../continuity/storage.js'
+} from '../../../../registry/erc8004.js'
+import { isAgentInVault, resolveConfiguredVaultAddress } from '../../../../registry/vault.js'
+import type { EthagentConfig, EthagentIdentity } from '../../../../../storage/config.js'
+import { readVaultAddressField } from '../../../../identityCompat.js'
+import { readCustodyMode } from '../../../custody/state.js'
+import { continuityWorkingTreeStatus, type ContinuityWorkingTreeStatus } from '../../../../continuity/storage.js'
 import type { AgentReconciliation } from './types.js'
 
 export function emptyReconciliation(): AgentReconciliation {

package/src/identity/hub/{utils.ts → shared/utils.ts}

@@ -1,8 +1,8 @@
-import type { EthagentConfig, EthagentIdentity } from '../../storage/config.js'
-import { supportedErc8004ChainForId } from '../registry/erc8004.js'
-import { snapshotSaveRequiresOwnerSigner } from './effects/shared/snapshot.js'
-import type { IdentityHubInitialAction } from './types.js'
-import type { ProfileUpdates, Step } from './identityHubReducer.js'
+import type { EthagentConfig, EthagentIdentity } from '../../../storage/config.js'
+import { supportedErc8004ChainForId } from '../../registry/erc8004.js'
+import { snapshotSaveRequiresOwnerSigner } from '../continuity/snapshot.js'
+import type { IdentityHubInitialAction } from '../types.js'
+import type { ProfileUpdates, Step } from '../identityHubReducer.js'
 
 const MIN_BUSY_ERROR_MS = 2000
 

package/src/identity/hub/{flows/token-transfer/IdentityHubTokenTransferFlow.tsx → transfer/TokenTransferFlow.tsx}

@@ -1,16 +1,16 @@
 import React from 'react'
-import type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
-import { supportedErc8004ChainForId } from '../../../registry/erc8004.js'
+import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
+import { supportedErc8004ChainForId } from '../../registry/erc8004.js'
 import {
   runTokenTransferStorageSubmit,
   runTokenTransferTargetSubmit,
-} from '../../effects/token-transfer/runTokenTransfer.js'
+} from './effects.js'
 import type {
   EffectCallbacks,
   TokenTransferProgress,
-} from '../../effects/types.js'
-import type { Step } from '../../identityHubReducer.js'
-import { BusyScreen } from '../../components/BusyScreen.js'
+} from '../shared/effects/types.js'
+import type { Step } from '../identityHubReducer.js'
+import { BusyScreen } from '../shared/components/BusyScreen.js'
 import { RebackupStorageScreen } from '../continuity/RebackupStorageScreen.js'
 import {
   TokenTransferReadyScreen,
@@ -27,7 +27,7 @@ type TokenTransferStep = Extract<Step, {
     | 'token-transfer-ready'
 }>
 
-type IdentityHubTokenTransferFlowProps = {
+type TokenTransferFlowProps = {
   step: TokenTransferStep
   callbacks: EffectCallbacks
   footer: React.ReactNode
@@ -45,7 +45,7 @@ export function isTokenTransferStep(step: Step): step is TokenTransferStep {
     || step.kind === 'token-transfer-ready'
 }
 
-export const IdentityHubTokenTransferFlow: React.FC<IdentityHubTokenTransferFlowProps> = ({
+export const TokenTransferFlow: React.FC<TokenTransferFlowProps> = ({
   step,
   callbacks,
   footer,

package/src/identity/hub/{flows/token-transfer → transfer}/TokenTransferScreens.tsx

@@ -1,19 +1,19 @@
 import React from 'react'
 import { Box, Text } from 'ink'
-import { Surface } from '../../../../ui/Surface.js'
-import { Select } from '../../../../ui/Select.js'
-import { Spinner } from '../../../../ui/Spinner.js'
-import { TextInput } from '../../../../ui/TextInput.js'
-import { theme } from '../../../../ui/theme.js'
-import { useAppInput } from '../../../../app/input/AppInputProvider.js'
-import { openExternalUrl } from '../../../../utils/openExternal.js'
-import type { EthagentIdentity } from '../../../../storage/config.js'
-import type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
-import type { TokenTransferProgress } from '../../effects/types.js'
-import { readCustodyMode } from '../../model/custody.js'
-import { shortAddress, shortCid } from '../../model/format.js'
-import { FlowTimeline } from '../../components/FlowTimeline.js'
-import { OPEN_BROWSER_HINT } from '../../components/WalletApprovalScreen.js'
+import { Surface } from '../../../ui/Surface.js'
+import { Select } from '../../../ui/Select.js'
+import { Spinner } from '../../../ui/Spinner.js'
+import { TextInput } from '../../../ui/TextInput.js'
+import { theme } from '../../../ui/theme.js'
+import { useAppInput } from '../../../app/input/AppInputProvider.js'
+import { openExternalUrl } from '../../../utils/openExternal.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
+import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
+import type { TokenTransferProgress } from '../shared/effects/types.js'
+import { readCustodyMode } from '../custody/state.js'
+import { shortAddress, shortCid } from '../shared/model/format.js'
+import { FlowTimeline } from '../shared/components/FlowTimeline.js'
+import { OPEN_BROWSER_HINT } from '../shared/components/WalletApprovalScreen.js'
 
 const TRANSFER_STEPS = ['Choose Receiver', 'Sender Signs', 'Receiver Signs', 'Sender Updates URI', 'Transfer Token']
 const APPROVAL_GUARDRAIL = 'No approve(), setApprovalForAll(), transferFrom(), or token approval is requested.'

package/src/identity/hub/{effects/token-transfer/runTokenTransfer.ts → transfer/effects.ts}

@@ -1,44 +1,44 @@
 import { getAddress, isAddress, type Address, type Hex } from 'viem'
-import type { EthagentIdentity } from '../../../../storage/config.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
 import {
   createTransferContinuitySnapshotChallenge,
   createTransferContinuitySnapshotEnvelope,
   serializeContinuitySnapshotEnvelope,
   transferSnapshotMetadataFromEnvelope,
-} from '../../../continuity/envelope.js'
+} from '../../continuity/envelope.js'
 import {
   continuityAgentSnapshot,
   continuityVaultStatus,
   readContinuityFiles,
   readPublicSkillsFile,
   writePublicSkillsFile,
-} from '../../../continuity/storage.js'
+} from '../../continuity/storage.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,
-} from '../../../registry/erc8004.js'
-import { resolveValidatedPinataJwt, savePinataJwt } from '../../../storage/pinataJwt.js'
-import { openBrowserWalletSession } from '../../../wallet/browserWallet.js'
-import { resolveEnsAddress } from '../../../ens/ensLookup.js'
-import type { Step } from '../../identityHubReducer.js'
-import type { EffectCallbacks } from '../types.js'
-import { awaitConfirmedReceipt } from '../receipts.js'
+} from '../../registry/erc8004.js'
+import { resolveValidatedPinataJwt, savePinataJwt } from '../../storage/pinataJwt.js'
+import { openBrowserWalletSession } from '../../wallet/browserWallet.js'
+import { resolveEnsAddress } from '../../ens/ensLookup.js'
+import type { Step } from '../identityHubReducer.js'
+import type { EffectCallbacks } from '../shared/effects/types.js'
+import { awaitConfirmedReceipt } from '../shared/effects/receipts.js'
 import {
   assertVerifiedPin,
   deriveAgentName,
-} from '../shared/profilePrep.js'
-import { operatorsPointerFromState } from '../shared/snapshot.js'
+} from '../shared/effects/profilePrep.js'
+import { operatorsPointerFromState } from '../continuity/snapshot.js'
 import { tokenTransferProgressForPhase } from './progress.js'
-import { assertTokenNotInVault } from '../vault/preflight.js'
+import { assertTokenNotInVault } from '../custody/preflight.js'
 
 type BackupMetadata = NonNullable<EthagentIdentity['backup']>
 type PublicSkillsMetadata = NonNullable<EthagentIdentity['publicSkills']>

package/src/identity/hub/{effects/token-transfer → transfer}/progress.ts

@@ -1,5 +1,5 @@
 import { getAddress } from 'viem'
-import type { TokenTransferProgress } from '../types.js'
+import type { TokenTransferProgress } from '../shared/effects/types.js'
 
 export function tokenTransferProgressForPhase(
   phase: TokenTransferProgress['phase'],

package/src/identity/hub/useIdentityHubController.ts

@@ -11,35 +11,35 @@ import {
 import {
   assertTokenNotInVault,
   TokenInVaultError,
-} from './effects/vault/preflight.js'
+} from './custody/preflight.js'
 import {
   runPublicProfilePreflight,
-} from './effects/publicProfile/runPublicProfileSave.js'
+} from './profile/effects.js'
 import {
   runRebackupPreflight,
-} from './effects/rebackup/runRebackup.js'
+} from './continuity/effects.js'
 import type {
   EffectCallbacks,
   IdentityCompletionSource,
   RestoreProgress,
   TokenTransferProgress,
-} from './effects/types.js'
-import { resolveVaultAddress } from './flows/custody/custodyEffects.js'
-import { useCustodyFlow } from './flows/custody/useCustodyFlow.js'
-import { identityHubErrorView } from './model/errors.js'
-import { readCustodyMode } from './model/custody.js'
-import { selectEnsStatus } from './model/ens.js'
+} from './shared/effects/types.js'
+import { resolveVaultAddress } from './custody/transactions.js'
+import { useCustodyFlow } from './custody/useCustodyFlow.js'
+import { identityHubErrorView } from './shared/model/errors.js'
+import { readCustodyMode } from './custody/state.js'
+import { selectEnsStatus } from './ens/state.js'
 import { identityHubReducer, type ProfileUpdates, type Step } from './identityHubReducer.js'
 import type { IdentityHubProps } from './types.js'
 import {
   capitalizeFeedbackMessage,
   initialStepForAction,
   isWalletCancelled,
-} from './utils.js'
+} from './shared/utils.js'
 import {
   preflightTokenOwnership,
   useAgentReconciliation,
-} from './reconciliation/index.js'
+} from './shared/reconciliation/index.js'
 import { useIdentityHubContinuity } from './useIdentityHubContinuity.js'
 import { useIdentityHubSideEffects } from './useIdentityHubSideEffects.js'
 

package/src/identity/hub/useIdentityHubSideEffects.ts

@@ -1,36 +1,36 @@
 import { useEffect } from 'react'
 import type { EthagentConfig } from '../../storage/config.js'
 import { setTokenIdentity } from '../../storage/identity.js'
-import { isRegistrationPreflightError, pinataErrorText } from './model/errors.js'
+import { isRegistrationPreflightError, pinataErrorText } from './shared/model/errors.js'
 import type { ProfileUpdates, Step } from './identityHubReducer.js'
 import {
   runCreatePreflight,
   runCreateSigning,
-} from './effects/create.js'
+} from './create/effects.js'
 import {
   runRebackupSigning,
-} from './effects/rebackup/runRebackup.js'
+} from './continuity/effects.js'
 import {
   runPublicProfileSigning,
-} from './effects/publicProfile/runPublicProfileSave.js'
+} from './profile/effects.js'
 import {
   runTokenTransferSigning,
-} from './effects/token-transfer/runTokenTransfer.js'
+} from './transfer/effects.js'
 import {
   runEnsSetupRecordsTransaction,
   runEnsSetupRegistryTransaction,
   runUpdateEnsRecords,
-} from './effects/ens/index.js'
+} from './ens/index.js'
 import {
   runRecoveryRefetch,
-} from './effects/restore/index.js'
-import type { EffectCallbacks } from './effects/types.js'
-import { useRestoreFlowEffects } from './flows/restore/useRestoreFlowEffects.js'
+} from './restore/index.js'
+import type { EffectCallbacks } from './shared/effects/types.js'
+import { useRestoreEffects } from './restore/useRestoreEffects.js'
 import {
   isStorageError,
   isWalletCancelled,
   waitForMinimumBusyTime,
-} from './utils.js'
+} from './shared/utils.js'
 
 type TriggerRebackup = (
   backStep: Step,
@@ -104,7 +104,7 @@ export function useIdentityHubSideEffects({
     return () => { cancelled = true }
   }, [step])
 
-  useRestoreFlowEffects({ step, config, callbacks, handleStepError })
+  useRestoreEffects({ step, config, callbacks, handleStepError })
 
   useEffect(() => {
     if (step.kind !== 'rebackup-signing') return