ethagent 2.1.1 → 2.3.0

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 {
-  AssignEnsCurrentSetup,
   EnsSetupRow,
   footerHint,
 } from './EnsEditShared.js'
+import { IdentitySummary } from '../shared/components/IdentitySummary.js'
 import { UnlinkEnsReviewScreen } from './EnsEditReviewScreens.js'
 import {
   DeleteSubdomainTxRunner,
@@ -28,10 +28,11 @@ import {
 import type {
   EnsEditProps,
   EnsPhase,
-} from './ensEditTypes.js'
+} from './types.js'
 
 type MaintenanceScreenProps = {
   phase: EnsPhase
+  identity: EnsEditProps['identity']
   currentEnsName: string
   currentEnsCanDelete: boolean
   savedCustodyMode: CustodyMode | undefined
@@ -49,11 +50,11 @@ type MaintenanceScreenProps = {
   onBack: () => void
   onEnsUnlink: EnsEditProps['onEnsUnlink']
   onEnsRecordsUpdate: EnsEditProps['onEnsRecordsUpdate']
-  onManageOperatorWalletAccess: EnsEditProps['onManageOperatorWalletAccess']
 }
 
 export function renderEnsMaintenancePhase({
   phase,
+  identity,
   currentEnsName,
   currentEnsCanDelete,
   savedCustodyMode,
@@ -71,10 +72,9 @@ export function renderEnsMaintenancePhase({
   onBack,
   onEnsUnlink,
   onEnsRecordsUpdate,
-  onManageOperatorWalletAccess,
 }: MaintenanceScreenProps): React.ReactNode | null {
   if (phase.kind === 'mode-select') {
-    type EnsAction = 'link' | 'unlink' | 'delete-subdomain' | 'manage-operator-wallets' | 'back'
+    type EnsAction = 'link' | 'unlink' | 'back'
     const isAdvanced = savedCustodyMode === 'advanced'
     const multiNeedsCustodySetup = isAdvanced && !savedOwnerAddress
     const subtitle = currentEnsName
@@ -83,19 +83,11 @@ export function renderEnsMaintenancePhase({
     const linkHint = multiNeedsCustodySetup
       ? 'Set Advanced custody first via Custody Mode'
       : isAdvanced
-        ? 'Walks you through Root, Name, Operator Wallet, Review, and Apply'
+        ? 'Walks you through Root, Name, Review, and Apply'
         : 'Walks you through Root, Name, Review, and Apply'
     const options: Array<{ value: EnsAction; role?: 'section' | 'utility'; label: string; hint?: string; disabled?: boolean }> = []
-    options.push({ value: 'link', role: 'section', label: 'Name' })
     if (currentEnsName) {
       options.push({ value: 'unlink', label: 'Unlink Name', hint: 'Removes this name from the token. Set up a different name afterward by linking again.' })
-      if (currentEnsCanDelete) {
-        options.push({
-          value: 'delete-subdomain',
-          label: 'Delete Subdomain',
-          hint: 'Clear the onchain subdomain entry at the parent name. The label is freed for reuse, and this token unlinks from it.',
-        })
-      }
     } else {
       options.push({
         value: 'link',
@@ -104,36 +96,16 @@ export function renderEnsMaintenancePhase({
         disabled: multiNeedsCustodySetup,
       })
     }
-    if (isAdvanced && savedOwnerAddress) {
-      options.push({ value: 'manage-operator-wallets', role: 'section', label: 'Operator Wallets' })
-      options.push({
-        value: 'manage-operator-wallets',
-        label: 'Manage Operator Wallets',
-        hint: "Authorize or revoke wallets that can update this name's token and profile text records on your behalf",
-      })
-    }
     options.push({ value: 'back', role: 'section', label: 'Navigation' })
     options.push({ value: 'back', label: 'Back', hint: 'Return to Identity Hub', role: 'utility' })
     return (
       <Surface
         title="ENS Name"
         subtitle={subtitle}
-        footer={footerHint('picking an action starts a stepped flow · enter select · esc back')}
+        footer={footerHint('enter select · esc back')}
       >
-        <AssignEnsCurrentSetup
-          currentEnsName={currentEnsName}
-          currentMode={savedCustodyMode}
-          ownerAddress={savedOwnerAddress}
-          operatorAddress={savedOperator}
-          tokenNetworkLabel={registryNetworkLabel}
-        />
-        {!currentEnsName ? (
-          <Box marginTop={1}>
-            <Text color={theme.dim}>No subdomain linked yet. Discovery falls back to the token ID + network pair until one is set.</Text>
-          </Box>
-        ) : null}
-        {validationError ? <Text color={theme.accentError}>{validationError}</Text> : null}
-        <Box marginTop={1}>
+        {validationError ? <Box marginBottom={1}><Text color={theme.accentError}>{validationError}</Text></Box> : null}
+        <Box>
           <Select<EnsAction>
             options={options}
             hintLayout="inline"
@@ -143,14 +115,6 @@ export function renderEnsMaintenancePhase({
                 runUnlinkEnsLoading(currentEnsName)
                 return
               }
-              if (choice === 'delete-subdomain' && currentEnsName && currentEnsCanDelete) {
-                runDeleteSubdomainPreflight(currentEnsName)
-                return
-              }
-              if (choice === 'manage-operator-wallets') {
-                onManageOperatorWalletAccess()
-                return
-              }
               if (choice === 'link') {
                 if (multiNeedsCustodySetup) return
                 if (isAdvanced && savedOwnerAddress) {
@@ -175,9 +139,7 @@ export function renderEnsMaintenancePhase({
         subtitle={`Reading ethagent records from ${phase.fullName}`}
         footer={footerHint('esc back')}
       >
-        <Box marginTop={1}>
-          <Spinner label="reading current ENS record values..." />
-        </Box>
+        <Spinner label="reading current ENS record values..." />
         <EscCancel onCancel={() => setPhase({ kind: 'mode-select' })} />
       </Surface>
     )
@@ -210,9 +172,7 @@ export function renderEnsMaintenancePhase({
         subtitle={`Verifying the parent of ${phase.fullName} on Ethereum mainnet.`}
         footer={footerHint('esc back')}
       >
-        <Box marginTop={1}>
-          <Spinner label="reading parent owner from ENS..." />
-        </Box>
+        <Spinner label="reading parent owner from ENS..." />
         <EscCancel onCancel={() => setPhase({ kind: 'mode-select' })} />
       </Surface>
     )
@@ -225,10 +185,10 @@ export function renderEnsMaintenancePhase({
         subtitle={`Onchain check for ${phase.fullName} did not pass.`}
         footer={footerHint('enter select · esc back')}
       >
-        <Box flexDirection="column" marginTop={1}>
+        <Box flexDirection="column" marginBottom={1}>
           <Text color={theme.accentError}>{phase.reason}</Text>
         </Box>
-        <Box marginTop={1}>
+        <Box>
           <Select<'back'>
             options={[
               { value: 'back', role: 'section', label: 'Navigation' },
@@ -251,7 +211,7 @@ export function renderEnsMaintenancePhase({
         subtitle={`Clear the onchain entry for ${plan.fullName} at ${plan.parentName}.`}
         footer={footerHint('enter select · esc back')}
       >
-        <Box flexDirection="column" marginTop={1}>
+        <Box flexDirection="column" marginBottom={1}>
           <EnsSetupRow label="Subdomain" value={plan.fullName} />
           <EnsSetupRow label="Parent" value={plan.parentName} />
           <EnsSetupRow label="Owner wallet" value={shortAddress(plan.parentOwnerAddress)} />
@@ -264,7 +224,7 @@ export function renderEnsMaintenancePhase({
             value="Onchain: subdomain owner and resolver set to 0. Locally: this token unlinks from the name."
           />
         </Box>
-        <Box marginTop={1}>
+        <Box>
           <Select<'delete' | 'back'>
             options={[
               { value: 'delete', role: 'section', label: 'Action' },
@@ -310,10 +270,10 @@ export function renderEnsMaintenancePhase({
         subtitle={`${phase.fullName} is cleared onchain and unlinked from this token.`}
         footer={footerHint('enter select · esc back')}
       >
-        <Box flexDirection="column" marginTop={1}>
+        <Box flexDirection="column" marginBottom={1}>
           <Text color={theme.text}>The label is freed for reuse on the parent name.</Text>
         </Box>
-        <Box marginTop={1}>
+        <Box>
           <Select<'back'>
             options={[
               { value: 'back', role: 'section', label: 'Navigation' },

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
@@ -113,19 +113,6 @@ export const EnsSetupReviewScreen: React.FC<EnsSetupReviewScreenProps> = ({
 }) => {
   type Action = 'begin' | 'back'
   const isSimple = setup.mode === 'simple'
-  const [ownerIsSmartAccount, setOwnerIsSmartAccount] = React.useState(false)
-  React.useEffect(() => {
-    if (isSimple) return
-    let cancelled = false
-    const client = createErc8004PublicClient(registry)
-    client.getBytecode({ address: getAddress(setup.ownerAddress) })
-      .then(code => {
-        if (cancelled) return
-        if (code && code !== '0x') setOwnerIsSmartAccount(true)
-      })
-      .catch(() => {})
-    return () => { cancelled = true }
-  }, [isSimple, registry, setup.ownerAddress])
   const signerLabel = isSimple ? 'Connected wallet' : 'Owner wallet'
   const switchNotice = setupSwitchNotice(currentEnsName, currentMode, setup.fullName, setup.mode)
   const createLabel = setup.registryAction === 'create-subdomain'
@@ -160,11 +147,6 @@ export const EnsSetupReviewScreen: React.FC<EnsSetupReviewScreenProps> = ({
         <EnsSetupRow label="ENS network" value="Ethereum Mainnet" />
         <EnsSetupRow label="Signer wallet" value={`${shortAddress(setup.ownerAddress)} (${signerLabel.toLowerCase()})`} />
         <EnsSetupRow label="Registry action" value={createLabel} />
-        {ownerIsSmartAccount ? (
-          <Box marginTop={1}>
-            <Text color={theme.accentError}>Owner wallet appears to be a smart account. Resolver delegation may require special handling depending on your wallet provider; if the operator wallet later cannot write ENS records, run "Fix Records" to retry.</Text>
-          </Box>
-        ) : null}
       </Box>
       <Box marginTop={1}>
         <Select<Action>

package/src/identity/hub/ens/EnsEditRunners.tsx

@@ -0,0 +1,62 @@
+import React from 'react'
+import type { Address } from 'viem'
+import { mainnet } from 'viem/chains'
+import { useAppInput } from '../../../app/input/AppInputProvider.js'
+import {
+  createMainnetClient,
+} from '../../ens/ensLookup.js'
+import type { EnsSubdomainDeletePlan } from '../../ens/ensAutomation.js'
+import {
+  sendBrowserWalletTransaction,
+  type BrowserWalletReady,
+} from '../../wallet/browserWallet.js'
+import { WalletApprovalScreen } from '../shared/components/WalletApprovalScreen.js'
+
+export const EscCancel: React.FC<{ onCancel: () => void }> = ({ onCancel }) => {
+  useAppInput((_input, key) => {
+    if (key.escape) onCancel()
+  })
+  return null
+}
+
+export const DeleteSubdomainTxRunner: React.FC<{
+  plan: EnsSubdomainDeletePlan
+  ownerAddress: Address
+  walletSession: BrowserWalletReady | null
+  onWalletReady: (session: BrowserWalletReady | null) => void
+  onDeleted: () => void
+  onError: (msg: string) => void
+}> = ({ plan, ownerAddress, walletSession, onWalletReady, onDeleted, onError }) => {
+  const startedRef = React.useRef(false)
+  React.useEffect(() => {
+    if (startedRef.current) return
+    startedRef.current = true
+    sendBrowserWalletTransaction({
+      chainId: mainnet.id,
+      expectedAccount: ownerAddress,
+      to: plan.transaction.to,
+      data: plan.transaction.data,
+      purpose: 'delete-ens-subdomain',
+      onReady: ready => onWalletReady(ready),
+    })
+      .then(async result => {
+        onWalletReady(null)
+        const client = createMainnetClient()
+        await client.waitForTransactionReceipt({ hash: result.txHash })
+        onDeleted()
+      })
+      .catch((err: unknown) => {
+        onWalletReady(null)
+        onError(err instanceof Error ? err.message : String(err))
+      })
+  }, [])
+  return (
+    <WalletApprovalScreen
+      title="Delete ENS Subdomain"
+      subtitle={`Clearing the subnode for ${plan.fullName} at ${plan.parentName} on Ethereum mainnet.`}
+      walletSession={walletSession}
+      label="waiting for owner wallet transaction..."
+      onCancel={() => onError('Subdomain deletion cancelled.')}
+    />
+  )
+}

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>
 
@@ -123,13 +123,14 @@ export const AssignEnsCurrentSetup: React.FC<AssignEnsCurrentSetupProps> = ({
 type SubdomainEntryProps = {
   parent: string
   ownerAddress: Address
-  suggestion: string
+  initialValue?: string
+  placeholder?: string
   error?: string
   onConfirm: (fullName: string) => void
   onBack: () => void
 }
 
-export const SubdomainEntry: React.FC<SubdomainEntryProps> = ({ parent, ownerAddress, suggestion, error, onConfirm, onBack }) => (
+export const SubdomainEntry: React.FC<SubdomainEntryProps> = ({ parent, ownerAddress, initialValue, placeholder, error, onConfirm, onBack }) => (
   <Surface
     title={`Subdomain of ${parent}`}
     footer={footerHint('enter continues · esc back')}
@@ -139,8 +140,8 @@ export const SubdomainEntry: React.FC<SubdomainEntryProps> = ({ parent, ownerAdd
     {error ? <Text color={theme.accentError}>{error}</Text> : null}
     <TextInput
       key={`edit-ens-subdomain-${parent}`}
-      initialValue={suggestion}
-      placeholder="subdomain name"
+      initialValue={initialValue ?? ''}
+      placeholder={placeholder || 'subdomain name'}
       validate={value => {
         const v = sanitizeSubdomainPrefix(value)
         if (!v) return 'Subdomain name cannot be empty'