ethagent 2.2.0 → 2.4.0

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

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

@@ -1,38 +1,38 @@
 import React from 'react'
 import { Box, Text } from 'ink'
 import { getAddress, type Address } from 'viem'
-import { Surface } from '../../../../ui/Surface.js'
-import { Select, type SelectOption } from '../../../../ui/Select.js'
-import { theme } from '../../../../ui/theme.js'
+import { Surface } from '../../../ui/Surface.js'
+import { Select, type SelectOption } from '../../../ui/Select.js'
+import { theme } from '../../../ui/theme.js'
 import {
   formatRecordValue,
   recordLabel,
   type AgentEnsRecords,
   type AgentRecordDiff,
-} from '../../../ens/agentRecords.js'
-import type { EnsValidation } from '../../../ens/ensLookup.js'
+} from '../../ens/agentRecords.js'
+import type { EnsValidation } from '../../ens/ensLookup.js'
 import type {
   EnsSetupBlockedPlan,
   EnsSetupPlan,
-} from '../../../ens/ensAutomation.js'
-import { createErc8004PublicClient, type Erc8004RegistryConfig } from '../../../registry/erc8004.js'
+} from '../../ens/ensAutomation.js'
+import { createErc8004PublicClient, type Erc8004RegistryConfig } from '../../registry/erc8004.js'
 import {
   displayCustodyMode,
   type CustodyMode,
-} from '../../model/custody.js'
-import { ensValidationReasonText } from '../../model/ens.js'
-import { shortAddress } from '../../model/format.js'
+} from '../custody/state.js'
+import { ensValidationReasonText } from './state.js'
+import { shortAddress } from '../shared/model/format.js'
 import {
   manualReasonTitle,
   modeSwitchHeading,
   setupSwitchNotice,
-} from './ensEditCopy.js'
+} from './editCopy.js'
 import {
   EnsSetupRow,
   footerHint,
   renderRecordValue,
 } from './EnsEditShared.js'
-import type { EnsIssueValidation } from './ensEditTypes.js'
+import type { EnsIssueValidation } from './types.js'
 
 type SimpleEnsIssueScreenProps = {
   fullName: string

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

@@ -1,16 +1,16 @@
 import React from 'react'
 import type { Address } from 'viem'
 import { mainnet } from 'viem/chains'
-import { useAppInput } from '../../../../app/input/AppInputProvider.js'
+import { useAppInput } from '../../../app/input/AppInputProvider.js'
 import {
   createMainnetClient,
-} from '../../../ens/ensLookup.js'
-import type { EnsSubdomainDeletePlan } from '../../../ens/ensAutomation.js'
+} from '../../ens/ensLookup.js'
+import type { EnsSubdomainDeletePlan } from '../../ens/ensAutomation.js'
 import {
   sendBrowserWalletTransaction,
   type BrowserWalletReady,
-} from '../../../wallet/browserWallet.js'
-import { WalletApprovalScreen } from '../../components/WalletApprovalScreen.js'
+} from '../../wallet/browserWallet.js'
+import { WalletApprovalScreen } from '../shared/components/WalletApprovalScreen.js'
 
 export const EscCancel: React.FC<{ onCancel: () => void }> = ({ onCancel }) => {
   useAppInput((_input, key) => {

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

@@ -1,26 +1,26 @@
 import React from 'react'
 import { Box, Text } from 'ink'
 import type { Address } from 'viem'
-import { Surface } from '../../../../ui/Surface.js'
-import { TextInput } from '../../../../ui/TextInput.js'
-import { theme } from '../../../../ui/theme.js'
+import { Surface } from '../../../ui/Surface.js'
+import { TextInput } from '../../../ui/TextInput.js'
+import { theme } from '../../../ui/theme.js'
 import {
   formatRecordValue,
   type AgentEnsRecordState,
-} from '../../../ens/agentRecords.js'
+} from '../../ens/agentRecords.js'
 import {
   isEthDomain,
   sanitizeSubdomainPrefix,
-} from '../../../ens/ensLookup.js'
+} from '../../ens/ensLookup.js'
 import {
   displayCustodyMode,
   readIdentityStateString,
   type CustodyMode,
-} from '../../model/custody.js'
-import { ensValidationReasonText } from '../../model/ens.js'
-import { shortAddress } from '../../model/format.js'
-import { readValidationFromState } from './ensEditCopy.js'
-import type { EnsEditProps } from './ensEditTypes.js'
+} from '../custody/state.js'
+import { ensValidationReasonText } from './state.js'
+import { shortAddress } from '../shared/model/format.js'
+import { readValidationFromState } from './editCopy.js'
+import type { EnsEditProps } from './types.js'
 
 export const footerHint = (hint: string) => <Text color={theme.dim}>{hint}</Text>
 

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

@@ -1,27 +1,27 @@
 import React from 'react'
 import { Box, Text } from 'ink'
 import { type Address } from 'viem'
-import { Surface } from '../../../../ui/Surface.js'
-import { Select, type SelectOption } from '../../../../ui/Select.js'
-import { Spinner } from '../../../../ui/Spinner.js'
-import { theme } from '../../../../ui/theme.js'
+import { Surface } from '../../../ui/Surface.js'
+import { Select, type SelectOption } from '../../../ui/Select.js'
+import { Spinner } from '../../../ui/Spinner.js'
+import { theme } from '../../../ui/theme.js'
 import {
   isEthDomain,
   normalizeEthDomain,
-} from '../../../ens/ensLookup.js'
-import { isRootEthName } from '../../../ens/ensAutomation.js'
-import type { Erc8004RegistryConfig } from '../../../registry/erc8004.js'
-import type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
+} from '../../ens/ensLookup.js'
+import { isRootEthName } from '../../ens/ensAutomation.js'
+import type { Erc8004RegistryConfig } from '../../registry/erc8004.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 {
   recordsDiffHasChanges,
   type EnsLinkOptions,
-} from './ensEditCopy.js'
-import { openExternalUrl } from '../../../../utils/openExternal.js'
-import { TextInput } from '../../../../ui/TextInput.js'
+} from './editCopy.js'
+import { openExternalUrl } from '../../../utils/openExternal.js'
+import { TextInput } from '../../../ui/TextInput.js'
 import {
   EnsStatusBanner,
   footerHint,
@@ -38,7 +38,7 @@ import type {
   DiscoveryState,
   EnsEditProps,
   EnsPhase,
-} from './ensEditTypes.js'
+} from './types.js'
 
 const ENS_DOMAINS_URL = 'https://app.ens.domains'
 

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

@@ -1,14 +1,14 @@
 import React from 'react'
-import { openImageFilePicker } from '../../../profile/imagePicker.js'
-import { readOwnerAddressField } from '../../../identityCompat.js'
-import type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
-import type { ProfileUpdates, Step } from '../../identityHubReducer.js'
-import { readCustodyMode } from '../../model/custody.js'
-import { OperatorWalletsScreen } from './OperatorWalletsScreen.js'
+import { openImageFilePicker } from '../../profile/imagePicker.js'
+import { readOwnerAddressField } from '../../identityCompat.js'
+import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
+import type { ProfileUpdates, Step } from '../identityHubReducer.js'
+import { readCustodyMode } from '../custody/state.js'
+import { OperatorWalletsScreen } from './EnsOperatorWalletsScreen.js'
 import { EDIT_PROFILE_STEPS, EditProfileFlow } from '../profile/EditProfileFlow.js'
-import { FlowTimeline } from '../../components/FlowTimeline.js'
-import { WalletApprovalScreen } from '../../components/WalletApprovalScreen.js'
-import type { AgentReconciliation } from '../../reconciliation/index.js'
+import { FlowTimeline } from '../shared/components/FlowTimeline.js'
+import { WalletApprovalScreen } from '../shared/components/WalletApprovalScreen.js'
+import type { AgentReconciliation } from '../shared/reconciliation/index.js'
 
 type StepOf<K extends Step['kind']> = Extract<Step, { kind: K }>
 
@@ -25,7 +25,7 @@ type IdentityHubEnsStep = StepOf<
   | 'public-profile-signing'
 >
 
-type IdentityHubEnsFlowProps = {
+type EnsFlowProps = {
   step: IdentityHubEnsStep
   walletSession: BrowserWalletReady | null
   reconciliation: AgentReconciliation
@@ -37,7 +37,7 @@ type IdentityHubEnsFlowProps = {
   onWithdrawTokenForEns: (step: Step) => void
 }
 
-export function isIdentityHubEnsStep(step: Step): step is IdentityHubEnsStep {
+export function isEnsStep(step: Step): step is IdentityHubEnsStep {
   return step.kind === 'manage-ens-operators'
     || step.kind === 'edit-profile-name'
     || step.kind === 'edit-profile-description'
@@ -50,7 +50,7 @@ export function isIdentityHubEnsStep(step: Step): step is IdentityHubEnsStep {
     || step.kind === 'public-profile-signing'
 }
 
-export const IdentityHubEnsFlow: React.FC<IdentityHubEnsFlowProps> = ({
+export const EnsFlow: React.FC<EnsFlowProps> = ({
   step,
   walletSession,
   reconciliation,

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

@@ -1,31 +1,31 @@
 import React from 'react'
 import { Box, Text } from 'ink'
 import { getAddress, isAddress, type Address } from 'viem'
-import { Surface } from '../../../../ui/Surface.js'
-import { Select, type SelectOption } from '../../../../ui/Select.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 { EthagentIdentity } from '../../../../storage/config.js'
-import { readOwnerAddressField } from '../../../identityCompat.js'
-import type { Erc8004RegistryConfig } from '../../../registry/erc8004.js'
+import { Surface } from '../../../ui/Surface.js'
+import { Select, type SelectOption } from '../../../ui/Select.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 { EthagentIdentity } from '../../../storage/config.js'
+import { readOwnerAddressField } from '../../identityCompat.js'
+import type { Erc8004RegistryConfig } from '../../registry/erc8004.js'
 import {
   createWalletRestoreAccessChallenge,
   createWalletRestoreAccessKey,
-} from '../../../continuity/envelope.js'
-import { requestBrowserWalletSignature, type BrowserWalletReady } from '../../../wallet/browserWallet.js'
-import { FlowTimeline } from '../../components/FlowTimeline.js'
-import { OPEN_BROWSER_HINT } from '../../components/WalletApprovalScreen.js'
-import { readCustodyMode } from '../../model/custody.js'
-import { shortAddress } from '../../model/format.js'
-import type { ProfileUpdates } from '../../identityHubReducer.js'
+} from '../../continuity/envelope.js'
+import { requestBrowserWalletSignature, type BrowserWalletReady } from '../../wallet/browserWallet.js'
+import { FlowTimeline } from '../shared/components/FlowTimeline.js'
+import { OPEN_BROWSER_HINT } from '../shared/components/WalletApprovalScreen.js'
+import { readCustodyMode } from '../custody/state.js'
+import { shortAddress } from '../shared/model/format.js'
+import type { ProfileUpdates } from '../identityHubReducer.js'
 import {
   normalizeApprovedOperatorWallets,
   removeApprovedOperatorWallet,
   upsertApprovedOperatorWallet,
   type ApprovedOperatorWalletRecord,
-} from '../../operatorWallets.js'
+} from '../shared/operatorWallets.js'
 
 type OperatorPhase =
   | { kind: 'main'; notice?: string; error?: string }

package/src/identity/hub/{advancedEnsValidation.ts → ens/advancedEnsValidation.ts}

@@ -1,9 +1,9 @@
 import { getAddress, type Address, type PublicClient } from 'viem'
-import { validateAgentEnsLink, type DiscoverOptions, type EnsValidation } from '../ens/ensLookup.js'
+import { validateAgentEnsLink, type DiscoverOptions, type EnsValidation } from '../../ens/ensLookup.js'
 import {
   validateErc8004TokenOwner,
   type Erc8004RegistryConfig,
-} from '../registry/erc8004.js'
+} from '../../registry/erc8004.js'
 
 type TokenOwnerReadClient = Pick<PublicClient, 'readContract'>
 

package/src/identity/hub/{flows/ens/ensEditCopy.ts → ens/editCopy.ts}

@@ -1,7 +1,7 @@
 import { getAddress, type Address } from 'viem'
-import type { AgentEnsRecords, AgentRecordDiff } from '../../../ens/agentRecords.js'
-import type { EnsRegistryAction, EnsSetupBlockedPlan } from '../../../ens/ensAutomation.js'
-import type { CustodyMode } from '../../model/custody.js'
+import type { AgentEnsRecords, AgentRecordDiff } from '../../ens/agentRecords.js'
+import type { EnsRegistryAction, EnsSetupBlockedPlan } from '../../ens/ensAutomation.js'
+import type { CustodyMode } from '../custody/state.js'
 
 export type EnsLinkOptions = {
   mode: 'simple' | 'advanced'

package/src/identity/hub/{effects/ens/flows.ts → ens/effects.ts}

@@ -1,19 +1,19 @@
 import type { Address, PublicClient } from 'viem'
-import type { EthagentIdentity } from '../../../../storage/config.js'
-import type { AgentEnsRecordState, AgentEnsRecords } from '../../../ens/agentRecords.js'
-import type { Erc8004RegistryConfig } from '../../../registry/erc8004.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
+import type { AgentEnsRecordState, AgentEnsRecords } from '../../ens/agentRecords.js'
+import type { Erc8004RegistryConfig } from '../../registry/erc8004.js'
 import {
   openBrowserWalletSession,
   type WalletPurpose,
-} from '../../../wallet/browserWallet.js'
-import type { ProfileUpdates, Step } from '../../identityHubReducer.js'
-import type { EffectCallbacks, EnsClearProgress, EnsLinkProgress, EnsUpdateProgress } from '../types.js'
+} from '../../wallet/browserWallet.js'
+import type { ProfileUpdates, Step } from '../identityHubReducer.js'
+import type { EffectCallbacks, EnsClearProgress, EnsLinkProgress, EnsUpdateProgress } from '../shared/effects/types.js'
 import {
   runEnsSetupRecordsTransaction,
   runEnsSetupRegistryTransaction,
   runUpdateEnsRecords,
 } from './transactions.js'
-import { runRebackupSigningInSession } from '../rebackup/runRebackup.js'
+import { runRebackupSigningInSession } from '../continuity/effects.js'
 
 type EnsRecordsFlowArgs = {
   identity: EthagentIdentity

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

@@ -2,7 +2,7 @@ export {
   runEnsLinkFlow,
   runEnsUnlinkFlow,
   runEnsUpdateFlow,
-} from './flows.js'
+} from './effects.js'
 export {
   ensRecordWritesForUpdate,
   runEnsSetupRecordsTransaction,

package/src/identity/hub/{model/ens.ts → ens/state.ts}

@@ -1,5 +1,5 @@
 import type { EthagentIdentity } from '../../../storage/config.js'
-import { readIdentityStateString } from './custody.js'
+import { readIdentityStateString } from '../custody/state.js'
 
 export type EnsStatusView =
   | { kind: 'none' }