ethagent 2.2.0 → 2.4.0

package/src/identity/hub/{effects/profile/profileState.ts → profile/state.ts}

@@ -1,181 +1,181 @@
-import { getAddress, isAddress, type Address } from 'viem'
-import type { EthagentIdentity } from '../../../../storage/config.js'
-import type { Erc8004RegistryConfig } from '../../../registry/erc8004.js'
-import { validateAgentEnsLink, type EnsValidation } from '../../../ens/ensLookup.js'
-import { clearOwnerAddressField, clearVaultAddressField, readOwnerAddressField, setVaultAddressField, setOwnerAddressField } from '../../../identityCompat.js'
-import { validateAdvancedEnsRelationship } from '../../advancedEnsValidation.js'
-import { readCustodyMode } from '../../model/custody.js'
-import { ensValidationReasonText } from '../../model/ens.js'
-import type { ProfileUpdates } from '../../identityHubReducer.js'
-import {
-  assertActiveOperatorIsApproved,
-  mergeApprovedOperatorWallets,
-  normalizeApprovedOperatorWallets,
-  upsertApprovedOperatorWallet,
-} from '../../operatorWallets.js'
-function ensValidationToState(validation: EnsValidation): Record<string, unknown> {
-  const checkedAt = new Date().toISOString()
-  if (validation.ok) {
-    return { ok: true, resolvedAddress: validation.resolvedAddress, checkedAt }
-  }
-  return {
-    ok: false,
-    reason: validation.reason,
-    ...(validation.detail ? { detail: validation.detail } : {}),
-    checkedAt,
-  }
-}
-
-export async function validateEnsForProfileUpdate(
-  fullName: string,
-  walletAccount: Address,
-  profile: ProfileUpdates,
-  baseState: Record<string, unknown>,
-  identity: EthagentIdentity,
-  registry: Erc8004RegistryConfig,
-): Promise<EnsValidation> {
-  const mode = readCustodyModeForUpdate(profile, baseState)
-  if (mode === 'advanced') {
-    const ownerAddress = readOwnerAddressForUpdate(profile, baseState)
-    if (!ownerAddress) {
-      return { ok: false, reason: 'lookup-failed', detail: 'no owner address recorded for advanced custody' }
-    }
-    const validation = await validateAdvancedEnsRelationship({
-      fullName,
-      ownerAddress: getAddress(ownerAddress),
-      registry,
-      agentId: identity.agentId,
-    })
-    return validation
-  }
-  return validateAgentEnsLink(fullName, walletAccount)
-}
-
-export function applyEnsValidationState(
-  state: Record<string, unknown>,
-  validation: EnsValidation,
-  profile: ProfileUpdates,
-  baseState: Record<string, unknown>,
-): void {
-  state.ensValidation = ensValidationToState(validation)
-  if (!validation.ok) {
-    throw new Error(`${ensValidationReasonText(validation.reason)}${validation.detail ? `: ${validation.detail}` : ''}`)
-  }
-  const mode = readCustodyModeForUpdate(profile, baseState)
-  state.custodyMode = mode
-  delete state.ensMode
-  if (mode === 'advanced') {
-    const ownerAddressValue = readOwnerAddressForUpdate(profile, baseState)
-    const operatorWallet = readActiveOperatorForUpdate(profile, baseState)
-    if (!ownerAddressValue || !operatorWallet) {
-      throw new Error('Advanced custody requires owner wallet and operator wallet addresses')
-    }
-    const ownerAddress = getAddress(ownerAddressValue)
-    setOwnerAddressField(state, getAddress(ownerAddress))
-    const operatorTouched =
-      profile.approvedOperatorWallets !== undefined
-      || profile.activeOperatorAddress !== undefined
-    if (operatorTouched) {
-      const existingOperators = mergeApprovedOperatorWallets(baseState.approvedOperatorWallets, profile.approvedOperatorWallets ?? [], { walletAddress: ownerAddress })
-      const approvedOperatorWallets = upsertApprovedOperatorWallet(existingOperators, getAddress(operatorWallet), { walletAddress: ownerAddress })
-      state.approvedOperatorWallets = approvedOperatorWallets
-      state.activeOperatorAddress = getAddress(operatorWallet)
-    } else {
-      state.approvedOperatorWallets = normalizeApprovedOperatorWallets(baseState.approvedOperatorWallets)
-      state.activeOperatorAddress = getAddress(operatorWallet)
-    }
-    return
-  }
-  clearOwnerAddressField(state)
-  delete state.approvedOperatorWallets
-  delete state.activeOperatorAddress
-}
-
-export function applyOperatorProfileState(
-  state: Record<string, unknown>,
-  profile: ProfileUpdates,
-  baseState: Record<string, unknown>,
-): void {
-  const operatorFieldsTouched = profile.custodyMode !== undefined
-    || profile.ownerAddress !== undefined
-    || profile.approvedOperatorWallets !== undefined
-    || profile.activeOperatorAddress !== undefined
-    || profile.operatorVaultAddress !== undefined
-    || profile.restoreAccessEpoch !== undefined
-  if (!operatorFieldsTouched) return
-
-  if (profile.custodyMode === 'simple') {
-    state.custodyMode = 'simple'
-    delete state.ensMode
-    clearOwnerAddressField(state)
-    delete state.approvedOperatorWallets
-    delete state.activeOperatorAddress
-    if (profile.restoreAccessEpoch !== undefined) {
-      state.restoreAccessEpoch = profile.restoreAccessEpoch
-    }
-    return
-  }
-  if (profile.custodyMode === 'advanced') {
-    state.custodyMode = 'advanced'
-    delete state.ensMode
-  }
-
-  if (profile.operatorVaultAddress !== undefined) {
-    if (typeof profile.operatorVaultAddress === 'string' && profile.operatorVaultAddress.trim()) {
-      setVaultAddressField(state, getAddress(profile.operatorVaultAddress))
-    } else {
-      clearVaultAddressField(state)
-    }
-  }
-
-  if (typeof profile.ownerAddress === 'string' && profile.ownerAddress.trim()) {
-    setOwnerAddressField(state, getAddress(profile.ownerAddress))
-  }
-
-  const approvedOperatorWallets = profile.approvedOperatorWallets !== undefined
-    ? normalizeApprovedOperatorWallets(profile.approvedOperatorWallets)
-    : normalizeApprovedOperatorWallets(baseState.approvedOperatorWallets)
-  if (profile.approvedOperatorWallets !== undefined) {
-    const ownerForCheck = readOwnerAddressField(state) ?? readOwnerAddressField(baseState) ?? ''
-    if (ownerForCheck && isAddress(ownerForCheck, { strict: false })) {
-      const ownerLower = ownerForCheck.toLowerCase()
-      if (approvedOperatorWallets.some(record => record.address.toLowerCase() === ownerLower)) {
-        throw new Error('Operator wallet must be different from the owner wallet')
-      }
-    }
-    state.approvedOperatorWallets = approvedOperatorWallets
-  }
-
-  const active = profile.activeOperatorAddress !== undefined
-    ? assertActiveOperatorIsApproved(approvedOperatorWallets, profile.activeOperatorAddress)
-    : assertActiveOperatorIsApproved(approvedOperatorWallets, readActiveOperatorForUpdate({}, baseState))
-  if (active) {
-    state.activeOperatorAddress = active
-  } else if (profile.activeOperatorAddress !== undefined) {
-    delete state.activeOperatorAddress
-  }
-  if (profile.restoreAccessEpoch !== undefined) {
-    state.restoreAccessEpoch = profile.restoreAccessEpoch
-  }
-}
-
-function readCustodyModeForUpdate(profile: ProfileUpdates, baseState: Record<string, unknown>): 'simple' | 'advanced' {
-  if (profile.custodyMode === 'simple' || profile.custodyMode === 'advanced') return profile.custodyMode
-  return readCustodyMode(baseState) ?? 'simple'
-}
-
-function readOwnerAddressForUpdate(profile: ProfileUpdates, baseState: Record<string, unknown>): string | undefined {
-  if (typeof profile.ownerAddress === 'string' && profile.ownerAddress.trim()) return profile.ownerAddress.trim()
-  return readOwnerAddressField(baseState)
-}
-
-function readActiveOperatorForUpdate(profile: ProfileUpdates, baseState: Record<string, unknown>): string | undefined {
-  if (typeof profile.activeOperatorAddress === 'string' && profile.activeOperatorAddress.trim()) return profile.activeOperatorAddress.trim()
-  const profileApproved = normalizeApprovedOperatorWallets(profile.approvedOperatorWallets)
-  if (profileApproved[0]) return profileApproved[0].address
-  const storedActive = baseState.activeOperatorAddress
-  if (typeof storedActive === 'string' && storedActive.trim()) return storedActive.trim()
-  const storedApproved = normalizeApprovedOperatorWallets(baseState.approvedOperatorWallets)
-  if (storedApproved[0]) return storedApproved[0].address
-  return undefined
-}
+import { getAddress, isAddress, type Address } from 'viem'
+import type { EthagentIdentity } from '../../../storage/config.js'
+import type { Erc8004RegistryConfig } from '../../registry/erc8004.js'
+import { validateAgentEnsLink, type EnsValidation } from '../../ens/ensLookup.js'
+import { clearOwnerAddressField, clearVaultAddressField, readOwnerAddressField, setVaultAddressField, setOwnerAddressField } from '../../identityCompat.js'
+import { validateAdvancedEnsRelationship } from '../ens/advancedEnsValidation.js'
+import { readCustodyMode } from '../custody/state.js'
+import { ensValidationReasonText } from '../ens/state.js'
+import type { ProfileUpdates } from '../identityHubReducer.js'
+import {
+  assertActiveOperatorIsApproved,
+  mergeApprovedOperatorWallets,
+  normalizeApprovedOperatorWallets,
+  upsertApprovedOperatorWallet,
+} from '../shared/operatorWallets.js'
+function ensValidationToState(validation: EnsValidation): Record<string, unknown> {
+  const checkedAt = new Date().toISOString()
+  if (validation.ok) {
+    return { ok: true, resolvedAddress: validation.resolvedAddress, checkedAt }
+  }
+  return {
+    ok: false,
+    reason: validation.reason,
+    ...(validation.detail ? { detail: validation.detail } : {}),
+    checkedAt,
+  }
+}
+
+export async function validateEnsForProfileUpdate(
+  fullName: string,
+  walletAccount: Address,
+  profile: ProfileUpdates,
+  baseState: Record<string, unknown>,
+  identity: EthagentIdentity,
+  registry: Erc8004RegistryConfig,
+): Promise<EnsValidation> {
+  const mode = readCustodyModeForUpdate(profile, baseState)
+  if (mode === 'advanced') {
+    const ownerAddress = readOwnerAddressForUpdate(profile, baseState)
+    if (!ownerAddress) {
+      return { ok: false, reason: 'lookup-failed', detail: 'no owner address recorded for advanced custody' }
+    }
+    const validation = await validateAdvancedEnsRelationship({
+      fullName,
+      ownerAddress: getAddress(ownerAddress),
+      registry,
+      agentId: identity.agentId,
+    })
+    return validation
+  }
+  return validateAgentEnsLink(fullName, walletAccount)
+}
+
+export function applyEnsValidationState(
+  state: Record<string, unknown>,
+  validation: EnsValidation,
+  profile: ProfileUpdates,
+  baseState: Record<string, unknown>,
+): void {
+  state.ensValidation = ensValidationToState(validation)
+  if (!validation.ok) {
+    throw new Error(`${ensValidationReasonText(validation.reason)}${validation.detail ? `: ${validation.detail}` : ''}`)
+  }
+  const mode = readCustodyModeForUpdate(profile, baseState)
+  state.custodyMode = mode
+  delete state.ensMode
+  if (mode === 'advanced') {
+    const ownerAddressValue = readOwnerAddressForUpdate(profile, baseState)
+    const operatorWallet = readActiveOperatorForUpdate(profile, baseState)
+    if (!ownerAddressValue || !operatorWallet) {
+      throw new Error('Advanced custody requires owner wallet and operator wallet addresses')
+    }
+    const ownerAddress = getAddress(ownerAddressValue)
+    setOwnerAddressField(state, getAddress(ownerAddress))
+    const operatorTouched =
+      profile.approvedOperatorWallets !== undefined
+      || profile.activeOperatorAddress !== undefined
+    if (operatorTouched) {
+      const existingOperators = mergeApprovedOperatorWallets(baseState.approvedOperatorWallets, profile.approvedOperatorWallets ?? [], { walletAddress: ownerAddress })
+      const approvedOperatorWallets = upsertApprovedOperatorWallet(existingOperators, getAddress(operatorWallet), { walletAddress: ownerAddress })
+      state.approvedOperatorWallets = approvedOperatorWallets
+      state.activeOperatorAddress = getAddress(operatorWallet)
+    } else {
+      state.approvedOperatorWallets = normalizeApprovedOperatorWallets(baseState.approvedOperatorWallets)
+      state.activeOperatorAddress = getAddress(operatorWallet)
+    }
+    return
+  }
+  clearOwnerAddressField(state)
+  delete state.approvedOperatorWallets
+  delete state.activeOperatorAddress
+}
+
+export function applyOperatorProfileState(
+  state: Record<string, unknown>,
+  profile: ProfileUpdates,
+  baseState: Record<string, unknown>,
+): void {
+  const operatorFieldsTouched = profile.custodyMode !== undefined
+    || profile.ownerAddress !== undefined
+    || profile.approvedOperatorWallets !== undefined
+    || profile.activeOperatorAddress !== undefined
+    || profile.operatorVaultAddress !== undefined
+    || profile.restoreAccessEpoch !== undefined
+  if (!operatorFieldsTouched) return
+
+  if (profile.custodyMode === 'simple') {
+    state.custodyMode = 'simple'
+    delete state.ensMode
+    clearOwnerAddressField(state)
+    delete state.approvedOperatorWallets
+    delete state.activeOperatorAddress
+    if (profile.restoreAccessEpoch !== undefined) {
+      state.restoreAccessEpoch = profile.restoreAccessEpoch
+    }
+    return
+  }
+  if (profile.custodyMode === 'advanced') {
+    state.custodyMode = 'advanced'
+    delete state.ensMode
+  }
+
+  if (profile.operatorVaultAddress !== undefined) {
+    if (typeof profile.operatorVaultAddress === 'string' && profile.operatorVaultAddress.trim()) {
+      setVaultAddressField(state, getAddress(profile.operatorVaultAddress))
+    } else {
+      clearVaultAddressField(state)
+    }
+  }
+
+  if (typeof profile.ownerAddress === 'string' && profile.ownerAddress.trim()) {
+    setOwnerAddressField(state, getAddress(profile.ownerAddress))
+  }
+
+  const approvedOperatorWallets = profile.approvedOperatorWallets !== undefined
+    ? normalizeApprovedOperatorWallets(profile.approvedOperatorWallets)
+    : normalizeApprovedOperatorWallets(baseState.approvedOperatorWallets)
+  if (profile.approvedOperatorWallets !== undefined) {
+    const ownerForCheck = readOwnerAddressField(state) ?? readOwnerAddressField(baseState) ?? ''
+    if (ownerForCheck && isAddress(ownerForCheck, { strict: false })) {
+      const ownerLower = ownerForCheck.toLowerCase()
+      if (approvedOperatorWallets.some(record => record.address.toLowerCase() === ownerLower)) {
+        throw new Error('Operator wallet must be different from the owner wallet')
+      }
+    }
+    state.approvedOperatorWallets = approvedOperatorWallets
+  }
+
+  const active = profile.activeOperatorAddress !== undefined
+    ? assertActiveOperatorIsApproved(approvedOperatorWallets, profile.activeOperatorAddress)
+    : assertActiveOperatorIsApproved(approvedOperatorWallets, readActiveOperatorForUpdate({}, baseState))
+  if (active) {
+    state.activeOperatorAddress = active
+  } else if (profile.activeOperatorAddress !== undefined) {
+    delete state.activeOperatorAddress
+  }
+  if (profile.restoreAccessEpoch !== undefined) {
+    state.restoreAccessEpoch = profile.restoreAccessEpoch
+  }
+}
+
+function readCustodyModeForUpdate(profile: ProfileUpdates, baseState: Record<string, unknown>): 'simple' | 'advanced' {
+  if (profile.custodyMode === 'simple' || profile.custodyMode === 'advanced') return profile.custodyMode
+  return readCustodyMode(baseState) ?? 'simple'
+}
+
+function readOwnerAddressForUpdate(profile: ProfileUpdates, baseState: Record<string, unknown>): string | undefined {
+  if (typeof profile.ownerAddress === 'string' && profile.ownerAddress.trim()) return profile.ownerAddress.trim()
+  return readOwnerAddressField(baseState)
+}
+
+function readActiveOperatorForUpdate(profile: ProfileUpdates, baseState: Record<string, unknown>): string | undefined {
+  if (typeof profile.activeOperatorAddress === 'string' && profile.activeOperatorAddress.trim()) return profile.activeOperatorAddress.trim()
+  const profileApproved = normalizeApprovedOperatorWallets(profile.approvedOperatorWallets)
+  if (profileApproved[0]) return profileApproved[0].address
+  const storedActive = baseState.activeOperatorAddress
+  if (typeof storedActive === 'string' && storedActive.trim()) return storedActive.trim()
+  const storedApproved = normalizeApprovedOperatorWallets(baseState.approvedOperatorWallets)
+  if (storedApproved[0]) return storedApproved[0].address
+  return undefined
+}

package/src/identity/hub/{flows/restore → restore}/RestoreFlow.tsx

@@ -1,25 +1,25 @@
 import React from 'react'
 import { 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 { 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 {
   isCurrentAgentCandidate,
   tokenCandidateHint,
   tokenCandidateSelectLabel,
-} from '../../model/identity.js'
-import { networkLabel } from '../../model/network.js'
-import { shortAddress } from '../../model/format.js'
-import { registryConfigFromConfig } from '../../../registry/registryConfig.js'
-import type { Step } from '../../identityHubReducer.js'
-import { WalletApprovalScreen } from '../../components/WalletApprovalScreen.js'
-import { BusyScreen } from '../../components/BusyScreen.js'
-import type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
-import type { EthagentConfig } from '../../../../storage/config.js'
-import { restoreSignatureRequestForStep } from '../../effects/restore/index.js'
-import type { RestoreProgress } from '../../effects/types.js'
+} from '../profile/identity.js'
+import { networkLabel } from '../shared/model/network.js'
+import { shortAddress } from '../shared/model/format.js'
+import { registryConfigFromConfig } from '../../registry/registryConfig.js'
+import type { Step } from '../identityHubReducer.js'
+import { WalletApprovalScreen } from '../shared/components/WalletApprovalScreen.js'
+import { BusyScreen } from '../shared/components/BusyScreen.js'
+import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
+import type { EthagentConfig } from '../../../storage/config.js'
+import { restoreSignatureRequestForStep } from './index.js'
+import type { RestoreProgress } from '../shared/effects/types.js'
 
 type RestoreStep = Exclude<Extract<Step, { kind: `restore-${string}` }>, { kind: 'restore-wallet' | 'restore-network' }>
 

package/src/identity/hub/{effects/restore → restore}/apply.ts

@@ -1,19 +1,19 @@
 import { getAddress } from 'viem'
-import type { EthagentIdentity } from '../../../../storage/config.js'
-import { restoreAgentStateBackupEnvelope } from '../../../crypto/backupEnvelope.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
+import { restoreAgentStateBackupEnvelope } from '../../crypto/backupEnvelope.js'
 import {
   restoreContinuitySnapshotEnvelope,
   transferSnapshotMetadataFromEnvelope,
-} from '../../../continuity/envelope.js'
-import { ensureIdentityMarkdownScaffold, writeContinuityFiles } from '../../../continuity/storage.js'
-import { recordPublishedContinuitySnapshot } from '../../../continuity/snapshots.js'
-import { requestBrowserWalletSignature } from '../../../wallet/browserWallet.js'
-import { setVaultAddressField } from '../../../identityCompat.js'
-import type { Step } from '../../identityHubReducer.js'
-import type { EffectCallbacks } from '../types.js'
+} from '../../continuity/envelope.js'
+import { ensureIdentityMarkdownScaffold, writeContinuityFiles } from '../../continuity/storage.js'
+import { recordPublishedContinuitySnapshot } from '../../continuity/snapshots.js'
+import { requestBrowserWalletSignature } from '../../wallet/browserWallet.js'
+import { setVaultAddressField } from '../../identityCompat.js'
+import type { Step } from '../identityHubReducer.js'
+import type { EffectCallbacks } from '../shared/effects/types.js'
 import { isContinuitySnapshotEnvelope } from './envelopes.js'
 import { restoreSignatureRequestForStep } from './auth.js'
-import { type BackupMetadata, operatorStateFromCandidate, restorePublishedPublicSkills } from './shared.js'
+import { type BackupMetadata, operatorStateFromCandidate, restorePublishedPublicSkills } from './helpers.js'
 
 export async function runRestoreAuthorize(
   step: Extract<Step, { kind: 'restore-authorizing' }>,

package/src/identity/hub/{effects/restore → restore}/auth.ts

@@ -6,12 +6,12 @@ import {
   isWalletContinuitySnapshotEnvelope,
   walletContinuitySnapshotSlotForAddress,
   type ContinuitySnapshotEnvelope,
-} from '../../../continuity/envelope.js'
-import { assertAgentStateBackupOwner } from '../../../crypto/backupEnvelope.js'
-import type { Erc8004AgentCandidate } from '../../../registry/erc8004.js'
-import { requestBrowserWalletAccount, type WalletPurpose } from '../../../wallet/browserWallet.js'
-import type { Step } from '../../identityHubReducer.js'
-import type { EffectCallbacks } from '../types.js'
+} from '../../continuity/envelope.js'
+import { assertAgentStateBackupOwner } from '../../crypto/backupEnvelope.js'
+import type { Erc8004AgentCandidate } from '../../registry/erc8004.js'
+import { requestBrowserWalletAccount, type WalletPurpose } from '../../wallet/browserWallet.js'
+import type { Step } from '../identityHubReducer.js'
+import type { EffectCallbacks } from '../shared/effects/types.js'
 import { isContinuitySnapshotEnvelope, parseRestorableEnvelope } from './envelopes.js'
 import {
   isAuthorizedOperatorAddress,
@@ -19,7 +19,7 @@ import {
   ownerCandidateAddresses,
   requesterAddressFromHandle,
   restoreTransferSlotForRequester,
-} from './shared.js'
+} from './helpers.js'
 
 export async function runRestoreConnectWallet(
   step: Extract<Step, { kind: 'restore-wallet' }>,

package/src/identity/hub/{effects/restore → restore}/discover.ts

@@ -1,15 +1,15 @@
-import type { EthagentConfig } from '../../../../storage/config.js'
+import type { EthagentConfig } from '../../../storage/config.js'
 import {
   DEFAULT_IPFS_API_URL,
-} from '../../../storage/ipfs.js'
+} from '../../storage/ipfs.js'
 import {
   discoverOwnedAgentBackups,
   type Erc8004AgentCandidate,
   type Erc8004RegistryConfig,
-} from '../../../registry/erc8004.js'
-import type { RestorePurpose, Step } from '../../identityHubReducer.js'
-import type { EffectCallbacks } from '../types.js'
-import { isAbortError, isAuthorizedOperatorAddress, requesterAddressFromHandle } from './shared.js'
+} from '../../registry/erc8004.js'
+import type { RestorePurpose, Step } from '../identityHubReducer.js'
+import type { EffectCallbacks } from '../shared/effects/types.js'
+import { isAbortError, isAuthorizedOperatorAddress, requesterAddressFromHandle } from './helpers.js'
 import type { Address } from 'viem'
 
 export async function runRestoreDiscover(

package/src/identity/hub/{effects/restore → restore}/envelopes.ts

@@ -1,9 +1,9 @@
-import { parseAgentStateBackupEnvelope } from '../../../crypto/backupEnvelope.js'
+import { parseAgentStateBackupEnvelope } from '../../crypto/backupEnvelope.js'
 import {
   CONTINUITY_SNAPSHOT_ENVELOPE_VERSION,
   parseContinuitySnapshotEnvelope,
   type ContinuitySnapshotEnvelope,
-} from '../../../continuity/envelope.js'
+} from '../../continuity/envelope.js'
 
 export type RestorableEnvelope = ReturnType<typeof parseAgentStateBackupEnvelope> | ContinuitySnapshotEnvelope
 

package/src/identity/hub/{effects/restore → restore}/fetch.ts

@@ -1,6 +1,6 @@
-import { catFromIpfs } from '../../../storage/ipfs.js'
-import type { Step } from '../../identityHubReducer.js'
-import type { EffectCallbacks } from '../types.js'
+import { catFromIpfs } from '../../storage/ipfs.js'
+import type { Step } from '../identityHubReducer.js'
+import type { EffectCallbacks } from '../shared/effects/types.js'
 import { parseRestorableEnvelope } from './envelopes.js'
 import { assertCandidateCanReadEnvelope, restoreSignatureRequestForStep } from './auth.js'
 

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

@@ -1,13 +1,13 @@
 import { getAddress, isAddress, type Address } from 'viem'
-import type { EthagentIdentity } from '../../../../storage/config.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
 import {
   type ContinuitySnapshotEnvelope,
   type TransferContinuitySnapshotEnvelope,
-} from '../../../continuity/envelope.js'
-import { catFromIpfs } from '../../../storage/ipfs.js'
-import type { Erc8004AgentCandidate } from '../../../registry/erc8004.js'
-import { writePublicSkillsFile } from '../../../continuity/storage.js'
-import { normalizeApprovedOperatorWallets } from '../../operatorWallets.js'
+} from '../../continuity/envelope.js'
+import { catFromIpfs } from '../../storage/ipfs.js'
+import type { Erc8004AgentCandidate } from '../../registry/erc8004.js'
+import { writePublicSkillsFile } from '../../continuity/storage.js'
+import { normalizeApprovedOperatorWallets } from '../shared/operatorWallets.js'
 
 export type BackupMetadata = NonNullable<EthagentIdentity['backup']>
 

package/src/identity/hub/{effects/restore → restore}/recovery.ts

@@ -1,24 +1,24 @@
 import { getAddress, type Address } from 'viem'
-import type { EthagentIdentity } from '../../../../storage/config.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
 import {
   assertContinuitySnapshotOwner,
   isWalletContinuitySnapshotEnvelope,
   restoreContinuitySnapshotEnvelope,
   transferSnapshotMetadataFromEnvelope,
-} from '../../../continuity/envelope.js'
-import { ensureIdentityMarkdownScaffold, localContinuitySnapshotContentHashes, writeContinuityFiles } from '../../../continuity/storage.js'
-import { recordPublishedContinuitySnapshot, updatePublishedContinuitySnapshotContentHashes } from '../../../continuity/snapshots.js'
-import { catFromIpfs, DEFAULT_IPFS_API_URL } from '../../../storage/ipfs.js'
+} from '../../continuity/envelope.js'
+import { ensureIdentityMarkdownScaffold, localContinuitySnapshotContentHashes, writeContinuityFiles } from '../../continuity/storage.js'
+import { recordPublishedContinuitySnapshot, updatePublishedContinuitySnapshotContentHashes } from '../../continuity/snapshots.js'
+import { catFromIpfs, DEFAULT_IPFS_API_URL } from '../../storage/ipfs.js'
 import {
   discoverOwnedAgentBackupByTokenId,
   type Erc8004RegistryConfig,
-} from '../../../registry/erc8004.js'
-import { requestBrowserWalletSignature } from '../../../wallet/browserWallet.js'
-import { setVaultAddressField } from '../../../identityCompat.js'
-import type { EffectCallbacks } from '../types.js'
+} from '../../registry/erc8004.js'
+import { requestBrowserWalletSignature } from '../../wallet/browserWallet.js'
+import { setVaultAddressField } from '../../identityCompat.js'
+import type { EffectCallbacks } from '../shared/effects/types.js'
 import { isContinuitySnapshotEnvelope, parseRestorableEnvelope } from './envelopes.js'
 import { restoreMessageForWallet } from './auth.js'
-import { type BackupMetadata, operatorStateFromCandidate, restorePublishedPublicSkills } from './shared.js'
+import { type BackupMetadata, operatorStateFromCandidate, restorePublishedPublicSkills } from './helpers.js'
 
 export async function runRecoveryRefetch(
   identity: EthagentIdentity,

package/src/identity/hub/{effects/restore → restore}/resolve.ts

@@ -1,13 +1,13 @@
 import { type Address } from 'viem'
-import { DEFAULT_IPFS_API_URL } from '../../../storage/ipfs.js'
+import { DEFAULT_IPFS_API_URL } from '../../storage/ipfs.js'
 import {
   createErc8004PublicClient,
   discoverOwnedAgentBackupByTokenId,
   type Erc8004AgentCandidate,
   type Erc8004RegistryConfig,
-} from '../../../registry/erc8004.js'
-import { parseAgentTokenReference, readEthagentTextRecords } from '../../../ens/ensLookup.js'
-import { AGENT_RECORD_KEYS } from '../../../ens/agentRecords.js'
+} from '../../registry/erc8004.js'
+import { parseAgentTokenReference, readEthagentTextRecords } from '../../ens/ensLookup.js'
+import { AGENT_RECORD_KEYS } from '../../ens/agentRecords.js'
 
 const ETH_NAME_PATTERN = /^([a-z0-9-]+\.)+eth$/i
 

package/src/identity/hub/{effects → restore}/restoreAdmin.ts

@@ -3,7 +3,7 @@ import { saveConfig } from '../../../storage/config.js'
 import { normalizeErc8004RegistryConfig } from '../../registry/erc8004.js'
 import { registryConfigFromConfig } from '../../registry/registryConfig.js'
 import type { Step } from '../identityHubReducer.js'
-import type { EffectCallbacks } from './types.js'
+import type { EffectCallbacks } from '../shared/effects/types.js'
 
 export async function runRestoreRegistrySubmit(
   value: string,

package/src/identity/hub/{flows/restore/useRestoreFlowEffects.ts → restore/useRestoreEffects.ts}

@@ -1,13 +1,13 @@
 import { useEffect } from 'react'
-import type { EthagentConfig } from '../../../../storage/config.js'
+import type { EthagentConfig } from '../../../storage/config.js'
 import {
   runRestoreAuthorize,
   runRestoreConnectWallet,
   runRestoreDiscover,
   runRestoreFetch,
-} from '../../effects/restore/index.js'
-import type { EffectCallbacks } from '../../effects/types.js'
-import type { Step } from '../../identityHubReducer.js'
+} from './index.js'
+import type { EffectCallbacks } from '../shared/effects/types.js'
+import type { Step } from '../identityHubReducer.js'
 
 const MIN_BUSY_ERROR_MS = 2000
 
@@ -24,7 +24,7 @@ type RestoreFlowEffectsArgs = {
   handleStepError: (err: unknown, backStep: Step, softCancel?: Step) => void
 }
 
-export function useRestoreFlowEffects(args: RestoreFlowEffectsArgs): void {
+export function useRestoreEffects(args: RestoreFlowEffectsArgs): void {
   const { step, config, callbacks, handleStepError } = args
 
   useEffect(() => {