ethagent 2.2.0 → 2.4.0

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

@@ -1,239 +1,239 @@
-import type { Address, Hex, PublicClient } from 'viem'
-import {
-  DEFAULT_ETHEREUM_RPC_URL,
-  RegisterAgentPreflightError,
-  createErc8004PublicClient,
-  supportedErc8004ChainForId,
-} from '../../../registry/erc8004.js'
-import { encodeSetEthagentTextRecords } from '../../../ens/ensLookup.js'
-import { encodeEnsRecordsTransaction, encodeEnsRegistryTransaction, type EnsSetupPlan } from '../../../ens/ensAutomation.js'
-import type { AgentEnsRecordState, AgentEnsRecords } from '../../../ens/agentRecords.js'
-import { changedRecords } from '../../../ens/agentRecords.js'
-import { sendBrowserWalletTransaction, type BrowserWalletSession, type WalletPurpose } from '../../../wallet/browserWallet.js'
-import type { EffectCallbacks } from '../types.js'
-function chainLabel(chainId: number): string {
-  return supportedErc8004ChainForId(chainId)?.name ?? `chain ${chainId}`
-}
-
-function ensTokenChainName(chainId: number): string | undefined {
-  return chainId !== 1 ? chainLabel(chainId) : undefined
-}
-
-export async function runUpdateEnsRecords(args: {
-  fullName: string
-  ownerAddress: Address
-  records: AgentEnsRecords
-  currentRecords?: AgentEnsRecordState
-  callbacks: EffectCallbacks
-  purpose?: WalletPurpose
-  clearRecords?: boolean
-  publicClient?: PublicClient
-  tokenChainId?: number
-  session?: BrowserWalletSession
-  flowId?: string
-  flowStep?: number
-}): Promise<{ txHash: string }> {
-  const next = ensRecordWritesForUpdate({
-    records: args.records,
-    currentRecords: args.currentRecords,
-    clearRecords: args.clearRecords,
-  })
-  if (Object.keys(next).length === 0) {
-    throw new Error('No ENS records to update')
-  }
-  const publicClient = args.publicClient ?? createMainnetEnsPublicClient()
-  const encoded = await encodeSetEthagentTextRecords(args.fullName, next, { publicClient })
-  await preflightEnsRecordTransaction({
-    fullName: args.fullName,
-    account: args.ownerAddress,
-    to: encoded.resolverAddress,
-    data: encoded.data,
-    publicClient,
-    purpose: args.purpose ?? 'update-ens-records',
-  })
-  const tokenChainName = typeof args.tokenChainId === 'number' ? ensTokenChainName(args.tokenChainId) : undefined
-  const purpose = args.purpose ?? 'update-ens-records'
-  if (args.session) {
-    const result = await args.session.sendTransaction({
-      chainId: 1,
-      expectedAccount: args.ownerAddress,
-      to: encoded.resolverAddress,
-      data: encoded.data,
-      purpose,
-      ...(tokenChainName ? { tokenChainName } : {}),
-      ...(args.flowId ? { flowId: args.flowId } : {}),
-    })
-    return { txHash: result.txHash }
-  }
-  const result = await sendBrowserWalletTransaction({
-    chainId: 1,
-    expectedAccount: args.ownerAddress,
-    to: encoded.resolverAddress,
-    data: encoded.data,
-    purpose,
-    onReady: args.callbacks.onWalletReady,
-    ...(tokenChainName ? { tokenChainName } : {}),
-  })
-  args.callbacks.onWalletReady(null)
-  return { txHash: result.txHash }
-}
-
-export function ensRecordWritesForUpdate(args: {
-  records: AgentEnsRecords
-  currentRecords?: AgentEnsRecordState
-  clearRecords?: boolean
-}): Record<string, string> {
-  if (args.clearRecords) {
-    return changedRecords(args.currentRecords ?? {}, { token: '' })
-  }
-  return changedRecords(args.currentRecords ?? { token: '' }, args.records)
-}
-
-export async function runEnsSetupRegistryTransaction(args: {
-  setup: EnsSetupPlan
-  callbacks: EffectCallbacks
-  publicClient?: PublicClient
-  tokenChainId?: number
-  session?: BrowserWalletSession
-  flowId?: string
-  flowStep?: number
-}): Promise<{ txHash: string } | null> {
-  const encoded = encodeEnsRegistryTransaction(args.setup)
-  if (!encoded) return null
-  const publicClient = args.publicClient ?? createMainnetEnsPublicClient()
-  const purpose: WalletPurpose = args.setup.mode === 'simple' ? 'create-simple-ens-subdomain' : 'create-agent-ens-subdomain'
-  await preflightEnsRecordTransaction({
-    fullName: args.setup.fullName,
-    account: args.setup.ownerAddress,
-    to: encoded.to,
-    data: encoded.data,
-    publicClient,
-    purpose,
-  })
-  const tokenChainName = typeof args.tokenChainId === 'number' ? ensTokenChainName(args.tokenChainId) : undefined
-  if (args.session) {
-    const result = await args.session.sendTransaction({
-      chainId: 1,
-      expectedAccount: args.setup.ownerAddress,
-      to: encoded.to,
-      data: encoded.data,
-      purpose,
-      ...(tokenChainName ? { tokenChainName } : {}),
-      ...(args.flowId ? { flowId: args.flowId } : {}),
-      ...(typeof args.flowStep === 'number' ? { flowStep: args.flowStep } : {}),
-    })
-    await publicClient.waitForTransactionReceipt({ hash: result.txHash })
-    return { txHash: result.txHash }
-  }
-  const result = await sendBrowserWalletTransaction({
-    chainId: 1,
-    expectedAccount: args.setup.ownerAddress,
-    to: encoded.to,
-    data: encoded.data,
-    purpose,
-    onReady: args.callbacks.onWalletReady,
-    ...(tokenChainName ? { tokenChainName } : {}),
-  })
-  args.callbacks.onWalletReady(null)
-  await publicClient.waitForTransactionReceipt({ hash: result.txHash })
-  return { txHash: result.txHash }
-}
-
-export async function runEnsSetupRecordsTransaction(args: {
-  setup: EnsSetupPlan
-  callbacks: EffectCallbacks
-  publicClient?: PublicClient
-  tokenChainId?: number
-  session?: BrowserWalletSession
-  flowId?: string
-  flowStep?: number
-}): Promise<{ txHash: string } | null> {
-  const encoded = encodeEnsRecordsTransaction(args.setup)
-  if (!encoded) return null
-  const publicClient = args.publicClient ?? createMainnetEnsPublicClient()
-  const purpose: WalletPurpose = args.setup.mode === 'simple' ? 'set-simple-ens-records' : 'set-agent-ens-records'
-  await preflightEnsRecordTransaction({
-    fullName: args.setup.fullName,
-    account: args.setup.ownerAddress,
-    to: encoded.to,
-    data: encoded.data,
-    publicClient,
-    purpose,
-  })
-  const tokenChainName = typeof args.tokenChainId === 'number' ? ensTokenChainName(args.tokenChainId) : undefined
-  if (args.session) {
-    const result = await args.session.sendTransaction({
-      chainId: 1,
-      expectedAccount: args.setup.ownerAddress,
-      to: encoded.to,
-      data: encoded.data,
-      purpose,
-      ...(tokenChainName ? { tokenChainName } : {}),
-      ...(args.flowId ? { flowId: args.flowId } : {}),
-      ...(typeof args.flowStep === 'number' ? { flowStep: args.flowStep } : {}),
-    })
-    return { txHash: result.txHash }
-  }
-  const result = await sendBrowserWalletTransaction({
-    chainId: 1,
-    expectedAccount: args.setup.ownerAddress,
-    to: encoded.to,
-    data: encoded.data,
-    purpose,
-    onReady: args.callbacks.onWalletReady,
-    ...(tokenChainName ? { tokenChainName } : {}),
-  })
-  args.callbacks.onWalletReady(null)
-  return { txHash: result.txHash }
-}
-
-export function createMainnetEnsPublicClient(): PublicClient {
-  return createErc8004PublicClient({
-    chainId: 1,
-    rpcUrl: DEFAULT_ETHEREUM_RPC_URL,
-  })
-}
-
-async function preflightEnsRecordTransaction(args: {
-  fullName: string
-  account: Address
-  to: Address
-  data: Hex
-  publicClient: Pick<PublicClient, 'estimateGas'>
-  purpose: WalletPurpose
-}): Promise<void> {
-  try {
-    await args.publicClient.estimateGas({
-      account: args.account,
-      to: args.to,
-      data: args.data,
-    })
-  } catch (err: unknown) {
-    throw new RegisterAgentPreflightError({
-      code: 'simulation-failed',
-      title: ensPreflightErrorTitle(args.purpose),
-      detail: cleanPreflightError(err),
-      hint: ensPreflightErrorHint(args),
-    })
-  }
-}
-
-function ensPreflightErrorTitle(_purpose: WalletPurpose): string {
-  return 'ENS Record Update Blocked'
-}
-
-function ensPreflightErrorHint(args: {
-  fullName: string
-  purpose: WalletPurpose
-}): string {
-  const wallet = args.purpose === 'set-simple-ens-records' || args.purpose === 'update-ens-records' || args.purpose === 'clear-ens-records'
-    ? 'ENS owner wallet'
-    : 'owner wallet'
-  return `No transaction was sent. Connect the ${wallet} and confirm it can write ENS resolver records on ${args.fullName}.`
-}
-
-function cleanPreflightError(err: unknown): string {
-  return (err instanceof Error ? err.message : String(err))
-    .replace(/\s+/g, ' ')
-    .slice(0, 220)
-}
+import type { Address, Hex, PublicClient } from 'viem'
+import {
+  DEFAULT_ETHEREUM_RPC_URL,
+  RegisterAgentPreflightError,
+  createErc8004PublicClient,
+  supportedErc8004ChainForId,
+} from '../../registry/erc8004.js'
+import { encodeSetEthagentTextRecords } from '../../ens/ensLookup.js'
+import { encodeEnsRecordsTransaction, encodeEnsRegistryTransaction, type EnsSetupPlan } from '../../ens/ensAutomation.js'
+import type { AgentEnsRecordState, AgentEnsRecords } from '../../ens/agentRecords.js'
+import { changedRecords } from '../../ens/agentRecords.js'
+import { sendBrowserWalletTransaction, type BrowserWalletSession, type WalletPurpose } from '../../wallet/browserWallet.js'
+import type { EffectCallbacks } from '../shared/effects/types.js'
+function chainLabel(chainId: number): string {
+  return supportedErc8004ChainForId(chainId)?.name ?? `chain ${chainId}`
+}
+
+function ensTokenChainName(chainId: number): string | undefined {
+  return chainId !== 1 ? chainLabel(chainId) : undefined
+}
+
+export async function runUpdateEnsRecords(args: {
+  fullName: string
+  ownerAddress: Address
+  records: AgentEnsRecords
+  currentRecords?: AgentEnsRecordState
+  callbacks: EffectCallbacks
+  purpose?: WalletPurpose
+  clearRecords?: boolean
+  publicClient?: PublicClient
+  tokenChainId?: number
+  session?: BrowserWalletSession
+  flowId?: string
+  flowStep?: number
+}): Promise<{ txHash: string }> {
+  const next = ensRecordWritesForUpdate({
+    records: args.records,
+    currentRecords: args.currentRecords,
+    clearRecords: args.clearRecords,
+  })
+  if (Object.keys(next).length === 0) {
+    throw new Error('No ENS records to update')
+  }
+  const publicClient = args.publicClient ?? createMainnetEnsPublicClient()
+  const encoded = await encodeSetEthagentTextRecords(args.fullName, next, { publicClient })
+  await preflightEnsRecordTransaction({
+    fullName: args.fullName,
+    account: args.ownerAddress,
+    to: encoded.resolverAddress,
+    data: encoded.data,
+    publicClient,
+    purpose: args.purpose ?? 'update-ens-records',
+  })
+  const tokenChainName = typeof args.tokenChainId === 'number' ? ensTokenChainName(args.tokenChainId) : undefined
+  const purpose = args.purpose ?? 'update-ens-records'
+  if (args.session) {
+    const result = await args.session.sendTransaction({
+      chainId: 1,
+      expectedAccount: args.ownerAddress,
+      to: encoded.resolverAddress,
+      data: encoded.data,
+      purpose,
+      ...(tokenChainName ? { tokenChainName } : {}),
+      ...(args.flowId ? { flowId: args.flowId } : {}),
+    })
+    return { txHash: result.txHash }
+  }
+  const result = await sendBrowserWalletTransaction({
+    chainId: 1,
+    expectedAccount: args.ownerAddress,
+    to: encoded.resolverAddress,
+    data: encoded.data,
+    purpose,
+    onReady: args.callbacks.onWalletReady,
+    ...(tokenChainName ? { tokenChainName } : {}),
+  })
+  args.callbacks.onWalletReady(null)
+  return { txHash: result.txHash }
+}
+
+export function ensRecordWritesForUpdate(args: {
+  records: AgentEnsRecords
+  currentRecords?: AgentEnsRecordState
+  clearRecords?: boolean
+}): Record<string, string> {
+  if (args.clearRecords) {
+    return changedRecords(args.currentRecords ?? {}, { token: '' })
+  }
+  return changedRecords(args.currentRecords ?? { token: '' }, args.records)
+}
+
+export async function runEnsSetupRegistryTransaction(args: {
+  setup: EnsSetupPlan
+  callbacks: EffectCallbacks
+  publicClient?: PublicClient
+  tokenChainId?: number
+  session?: BrowserWalletSession
+  flowId?: string
+  flowStep?: number
+}): Promise<{ txHash: string } | null> {
+  const encoded = encodeEnsRegistryTransaction(args.setup)
+  if (!encoded) return null
+  const publicClient = args.publicClient ?? createMainnetEnsPublicClient()
+  const purpose: WalletPurpose = args.setup.mode === 'simple' ? 'create-simple-ens-subdomain' : 'create-agent-ens-subdomain'
+  await preflightEnsRecordTransaction({
+    fullName: args.setup.fullName,
+    account: args.setup.ownerAddress,
+    to: encoded.to,
+    data: encoded.data,
+    publicClient,
+    purpose,
+  })
+  const tokenChainName = typeof args.tokenChainId === 'number' ? ensTokenChainName(args.tokenChainId) : undefined
+  if (args.session) {
+    const result = await args.session.sendTransaction({
+      chainId: 1,
+      expectedAccount: args.setup.ownerAddress,
+      to: encoded.to,
+      data: encoded.data,
+      purpose,
+      ...(tokenChainName ? { tokenChainName } : {}),
+      ...(args.flowId ? { flowId: args.flowId } : {}),
+      ...(typeof args.flowStep === 'number' ? { flowStep: args.flowStep } : {}),
+    })
+    await publicClient.waitForTransactionReceipt({ hash: result.txHash })
+    return { txHash: result.txHash }
+  }
+  const result = await sendBrowserWalletTransaction({
+    chainId: 1,
+    expectedAccount: args.setup.ownerAddress,
+    to: encoded.to,
+    data: encoded.data,
+    purpose,
+    onReady: args.callbacks.onWalletReady,
+    ...(tokenChainName ? { tokenChainName } : {}),
+  })
+  args.callbacks.onWalletReady(null)
+  await publicClient.waitForTransactionReceipt({ hash: result.txHash })
+  return { txHash: result.txHash }
+}
+
+export async function runEnsSetupRecordsTransaction(args: {
+  setup: EnsSetupPlan
+  callbacks: EffectCallbacks
+  publicClient?: PublicClient
+  tokenChainId?: number
+  session?: BrowserWalletSession
+  flowId?: string
+  flowStep?: number
+}): Promise<{ txHash: string } | null> {
+  const encoded = encodeEnsRecordsTransaction(args.setup)
+  if (!encoded) return null
+  const publicClient = args.publicClient ?? createMainnetEnsPublicClient()
+  const purpose: WalletPurpose = args.setup.mode === 'simple' ? 'set-simple-ens-records' : 'set-agent-ens-records'
+  await preflightEnsRecordTransaction({
+    fullName: args.setup.fullName,
+    account: args.setup.ownerAddress,
+    to: encoded.to,
+    data: encoded.data,
+    publicClient,
+    purpose,
+  })
+  const tokenChainName = typeof args.tokenChainId === 'number' ? ensTokenChainName(args.tokenChainId) : undefined
+  if (args.session) {
+    const result = await args.session.sendTransaction({
+      chainId: 1,
+      expectedAccount: args.setup.ownerAddress,
+      to: encoded.to,
+      data: encoded.data,
+      purpose,
+      ...(tokenChainName ? { tokenChainName } : {}),
+      ...(args.flowId ? { flowId: args.flowId } : {}),
+      ...(typeof args.flowStep === 'number' ? { flowStep: args.flowStep } : {}),
+    })
+    return { txHash: result.txHash }
+  }
+  const result = await sendBrowserWalletTransaction({
+    chainId: 1,
+    expectedAccount: args.setup.ownerAddress,
+    to: encoded.to,
+    data: encoded.data,
+    purpose,
+    onReady: args.callbacks.onWalletReady,
+    ...(tokenChainName ? { tokenChainName } : {}),
+  })
+  args.callbacks.onWalletReady(null)
+  return { txHash: result.txHash }
+}
+
+export function createMainnetEnsPublicClient(): PublicClient {
+  return createErc8004PublicClient({
+    chainId: 1,
+    rpcUrl: DEFAULT_ETHEREUM_RPC_URL,
+  })
+}
+
+async function preflightEnsRecordTransaction(args: {
+  fullName: string
+  account: Address
+  to: Address
+  data: Hex
+  publicClient: Pick<PublicClient, 'estimateGas'>
+  purpose: WalletPurpose
+}): Promise<void> {
+  try {
+    await args.publicClient.estimateGas({
+      account: args.account,
+      to: args.to,
+      data: args.data,
+    })
+  } catch (err: unknown) {
+    throw new RegisterAgentPreflightError({
+      code: 'simulation-failed',
+      title: ensPreflightErrorTitle(args.purpose),
+      detail: cleanPreflightError(err),
+      hint: ensPreflightErrorHint(args),
+    })
+  }
+}
+
+function ensPreflightErrorTitle(_purpose: WalletPurpose): string {
+  return 'ENS Record Update Blocked'
+}
+
+function ensPreflightErrorHint(args: {
+  fullName: string
+  purpose: WalletPurpose
+}): string {
+  const wallet = args.purpose === 'set-simple-ens-records' || args.purpose === 'update-ens-records' || args.purpose === 'clear-ens-records'
+    ? 'ENS owner wallet'
+    : 'owner wallet'
+  return `No transaction was sent. Connect the ${wallet} and confirm it can write ENS resolver records on ${args.fullName}.`
+}
+
+function cleanPreflightError(err: unknown): string {
+  return (err instanceof Error ? err.message : String(err))
+    .replace(/\s+/g, ' ')
+    .slice(0, 220)
+}

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

@@ -1,20 +1,20 @@
 import type { Address } from 'viem'
-import type { EthagentIdentity } from '../../../../storage/config.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
 import type {
   AgentEnsRecordState,
   AgentEnsRecords,
   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 {
   EnsRegistryAction,
   EnsSetupBlockedPlan,
   EnsSetupPlan,
   EnsSubdomainDeletePlan,
-} from '../../../ens/ensAutomation.js'
-import type { Erc8004RegistryConfig } from '../../../registry/erc8004.js'
-import type { AgentReconciliation } from '../../reconciliation/index.js'
-import type { EnsLinkOptions } from './ensEditCopy.js'
+} from '../../ens/ensAutomation.js'
+import type { Erc8004RegistryConfig } from '../../registry/erc8004.js'
+import type { AgentReconciliation } from '../shared/reconciliation/index.js'
+import type { EnsLinkOptions } from './editCopy.js'
 
 export type EnsIssueValidation = Extract<EnsValidation, { ok: false }>
 

package/src/identity/hub/identityHubReducer.ts

@@ -7,9 +7,9 @@ import type { ContinuitySnapshotEnvelope } from '../continuity/envelope.js'
 import type { AgentEnsRecordState, AgentEnsRecords } from '../ens/agentRecords.js'
 import type { EnsSetupPlan } from '../ens/ensAutomation.js'
 import type { WalletPurpose } from '../wallet/browserWallet.js'
-import type { IdentityHubErrorView } from './model/errors.js'
-import type { ApprovedOperatorWalletInput } from './operatorWallets.js'
-import type { CustodyMode } from './model/custody.js'
+import type { IdentityHubErrorView } from './shared/model/errors.js'
+import type { ApprovedOperatorWalletInput } from './shared/operatorWallets.js'
+import type { CustodyMode } from './custody/state.js'
 
 export type RestorePurpose = 'restore' | 'switch'
 type RestoreNotFoundReason = 'no-owner-or-operator' | 'search-incomplete' | 'cancelled'

package/src/identity/hub/{flows/profile → profile}/EditProfileFlow.tsx

@@ -1,17 +1,17 @@
 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 type { AgentEnsRecordState, AgentEnsRecords } from '../../../ens/agentRecords.js'
-import type { EnsSetupPlan } from '../../../ens/ensAutomation.js'
-import type { Step } from '../../identityHubReducer.js'
-import { readIdentityStateString } from '../../model/custody.js'
-import { FlowTimeline } from '../../components/FlowTimeline.js'
-import { validateAgentIconReference } from '../../../profile/agentIcon.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 type { AgentEnsRecordState, AgentEnsRecords } from '../../ens/agentRecords.js'
+import type { EnsSetupPlan } from '../../ens/ensAutomation.js'
+import type { Step } from '../identityHubReducer.js'
+import { readIdentityStateString } from '../custody/state.js'
+import { FlowTimeline } from '../shared/components/FlowTimeline.js'
+import { validateAgentIconReference } from '../../profile/agentIcon.js'
 import { EnsEditFlow, type EnsLinkOptions } from '../ens/EnsEditFlow.js'
-import type { AgentReconciliation } from '../../reconciliation/index.js'
+import type { AgentReconciliation } from '../shared/reconciliation/index.js'
 
 type EditProfileFlowProps = {
   step: Extract<Step, { kind: 'edit-profile-name' | 'edit-profile-description' | 'edit-profile-image' | 'edit-profile-review' | 'edit-profile-ens' }>

package/src/identity/hub/{effects/publicProfile/runPublicProfileSave.ts → profile/effects.ts}

@@ -1,56 +1,56 @@
 import { getAddress, type Address } from 'viem'
-import type { EthagentIdentity } from '../../../../storage/config.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
 import {
   createWalletRestoreAccessChallenge,
   serializeContinuitySnapshotEnvelope,
   type WalletChallengePurpose,
-} from '../../../continuity/envelope.js'
+} from '../../continuity/envelope.js'
 import {
   prepareSyncedPublicSkillsJson,
   readContinuityFiles,
   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,
   type Erc8004RegistryConfig,
-} from '../../../registry/erc8004.js'
+} from '../../registry/erc8004.js'
 import {
   VAULT_ABI,
   encodeRotateAgentURI,
-} from '../../../registry/vault.js'
-import { resolveValidatedPinataJwt, savePinataJwt } from '../../../storage/pinataJwt.js'
+} from '../../registry/vault.js'
+import { resolveValidatedPinataJwt, savePinataJwt } from '../../storage/pinataJwt.js'
 import {
   openBrowserWalletSession,
   requestBrowserWalletSignatureAndTransaction,
   type BrowserWalletSignature,
   type WalletPurpose,
-} from '../../../wallet/browserWallet.js'
-import type { ProfileUpdates, Step } from '../../identityHubReducer.js'
-import { acquireTxGuard, releaseTxGuard } from '../../txGuard.js'
-import type { EffectCallbacks } from '../types.js'
-import { awaitConfirmedReceipt } from '../receipts.js'
+} from '../../wallet/browserWallet.js'
+import type { ProfileUpdates, Step } 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 {
   appendResolverSyncWarning,
   markCurrentContinuityFilesPublished,
   resolverSyncWarningMessage,
   syncVaultOperatorsAfterOwnerSave,
-} from '../shared/sync.js'
+} from '../shared/effects/sync.js'
 import {
   assertSnapshotSaveSignerAuthorized,
   createContinuityEnvelopeForSave,
@@ -59,8 +59,8 @@ import {
   ownerAddressForSnapshotSave,
   snapshotSaveWalletRole,
   walletRestoreAccessContext,
-} from '../shared/snapshot.js'
-import { rebackupCompletionMessage } from '../rebackup/runRebackup.js'
+} from '../continuity/snapshot.js'
+import { rebackupCompletionMessage } from '../continuity/effects.js'
 
 type BackupMetadata = NonNullable<EthagentIdentity['backup']>
 type PublicSkillsMetadata = NonNullable<EthagentIdentity['publicSkills']>

package/src/identity/hub/{model → profile}/identity.ts

@@ -1,8 +1,8 @@
 import type { EthagentConfig, EthagentIdentity } from '../../../storage/config.js'
 import { supportedErc8004ChainForId, type Erc8004AgentCandidate } from '../../registry/erc8004.js'
-import { readCustodyMode, type CustodyMode } from './custody.js'
-import { formatDate, shortAddress, shortCid } from './format.js'
-import { chainSummaryRow, networkLabel } from './network.js'
+import { readCustodyMode, type CustodyMode } from '../custody/state.js'
+import { formatDate, shortAddress, shortCid } from '../shared/model/format.js'
+import { chainSummaryRow, networkLabel } from '../shared/model/network.js'
 
 export const PREFLIGHT_AGENT_URI = 'ipfs://bafybeigdyrztma2dbfczw7q6ooozbxlqzyw5r7w4f3qw2axvvxqg3w6y7q'