ethagent 1.1.2 → 2.0.1

package/src/identity/hub/components/IdentitySummary.tsx

@@ -0,0 +1,190 @@
+import React from 'react'
+import { Box, Text } from 'ink'
+import { theme } from '../../../ui/theme.js'
+import type { EthagentConfig, EthagentIdentity } from '../../../storage/config.js'
+import {
+  displayCustodyMode,
+  identityOwnerAddress,
+  readCustodyMode,
+  readIdentityStateString,
+} from '../model/custody.js'
+import {
+  hasPendingPublish,
+  localChangeStatusView,
+  type LocalChangeStatusView,
+} from '../model/continuity.js'
+import { ensValidationReasonText, selectEnsStatus } from '../model/ens.js'
+import { shortAddress } from '../model/format.js'
+import { identitySummaryRows, lastBackupLabel } from '../model/identity.js'
+import { transferSnapshotView, type TransferSnapshotView } from '../model/transfer.js'
+
+import type { ContinuityWorkingTreeStatus } from '../../continuity/storage.js'
+
+interface IdentitySummaryProps {
+  identity?: EthagentIdentity
+  config?: EthagentConfig
+  workingStatus?: ContinuityWorkingTreeStatus | null
+  hideLocalChanges?: boolean
+  tokenLinked?: boolean
+  onchainOwner?: string
+}
+
+export const IdentitySummary: React.FC<IdentitySummaryProps> = ({ identity, config, workingStatus, hideLocalChanges = false, tokenLinked = true, onchainOwner }) => {
+  if (!identity) {
+    return (
+      <Text color={theme.dim}>No agent yet. Create or load one.</Text>
+    )
+  }
+
+  const rows = identitySummaryRows(identity, config)
+  const lastBackup = lastBackupLabel(identity)
+  const stateName = readIdentityStateString(identity.state, 'name')
+
+  const row = (label: string) => rows.find(item => item.label === label)
+  const localChangeStatus = localChangeStatusView(workingStatus)
+
+  const ensStatus = selectEnsStatus(identity)
+  const custodyMode = readCustodyMode(identity.state)
+  const activeOperator = readIdentityStateString(identity.state, 'activeOperatorAddress')
+  const approvedOperatorCount = Array.isArray((identity.state as Record<string, unknown> | undefined)?.approvedOperatorWallets)
+    ? ((identity.state as Record<string, unknown>).approvedOperatorWallets as unknown[]).length
+    : 0
+  const ownerAddress = identityOwnerAddress(identity, onchainOwner)
+  const transferSnapshot = transferSnapshotView(identity)
+
+  const tokenValue = row('token')?.value ?? 'Not Created'
+  const networkValue = row('network')?.value ?? 'Unknown'
+  const tokenLine = identity.agentId
+    ? `${tokenValue} · ${displayValue(networkValue)}`
+    : displayValue(tokenValue)
+
+  return (
+    <Box flexDirection="column">
+      <Text color={theme.accentPeriwinkle} bold>{stateName || 'Active Agent'}</Text>
+      <Text color={identity.agentId ? theme.text : theme.dim} bold={Boolean(identity.agentId)}>{tokenLine}</Text>
+      <Text>
+        <Text color={theme.dim}>{'ENS'.padEnd(12)}</Text>
+        {ensStatus.kind === 'linked'
+          ? <Text color={theme.accentPeriwinkle}>{ensStatus.name}</Text>
+          : ensStatus.kind === 'issue'
+            ? <Text color={theme.accentError}>{ensStatus.name} ({ensValidationReasonText(ensStatus.reason)})</Text>
+            : <Text color={theme.dim}>Not Linked</Text>}
+      </Text>
+      {tokenLinked ? (
+        <Text>
+          <Text color={theme.dim}>{'Custody'.padEnd(12)}</Text>
+          <Text color={custodyMode ? theme.text : theme.dim}>{displayCustodyMode(custodyMode)}</Text>
+        </Text>
+      ) : null}
+      {ownerAddress ? (
+        <Text>
+          <Text color={theme.dim}>{'Owner'.padEnd(12)}</Text>
+          <Text color={theme.text}>{shortAddress(ownerAddress)}</Text>
+        </Text>
+      ) : null}
+      {(() => {
+        if (custodyMode !== 'advanced') return null
+        const vaultAddress = readIdentityStateString(identity.state, 'operatorVaultAddress')
+        if (!vaultAddress) return null
+        return (
+          <Text>
+            <Text color={theme.dim}>{'Agent Vault'.padEnd(12)}</Text>
+            <Text color={theme.text}>{shortAddress(vaultAddress)}</Text>
+          </Text>
+        )
+      })()}
+      {tokenLinked && custodyMode === 'advanced' ? (
+        <Text>
+          <Text color={theme.dim}>{'Operators'.padEnd(12)}</Text>
+          {approvedOperatorCount > 1 ? (
+            <Text color={theme.text}>{`${approvedOperatorCount} authorized${activeOperator ? ` (active ${shortAddress(activeOperator)})` : ''}`}</Text>
+          ) : activeOperator ? (
+            <Text color={theme.text}>{shortAddress(activeOperator)}</Text>
+          ) : (
+            <Text color={theme.dim}>None Authorized</Text>
+          )}
+        </Text>
+      ) : null}
+      <Text>
+        <Text color={theme.dim}>{'Last Saved'.padEnd(12)}</Text>
+        <Text color={lastBackup === 'never' ? theme.dim : theme.text}>{displayValue(lastBackup)}</Text>
+      </Text>
+      {hasPendingPublish(identity) ? (
+        <Text>
+          <Text color={theme.dim}>{'Pending'.padEnd(12)}</Text>
+          <Text color={theme.dim}>local snapshot ahead of chain, owner wallet rotates the pointer</Text>
+        </Text>
+      ) : null}
+      {transferSnapshot ? (
+        <Box marginTop={1}>
+          <TransferSnapshotStatus status={transferSnapshot} />
+        </Box>
+      ) : null}
+      {!hideLocalChanges && (
+        <Box marginTop={1}>
+          <LocalChangeStatusLine status={localChangeStatus} />
+        </Box>
+      )}
+    </Box>
+  )
+}
+
+const TransferSnapshotStatus: React.FC<{ status: NonNullable<TransferSnapshotView> }> = ({ status }) => {
+  const receiverLabel = status.receiverHandle && status.receiverHandle !== status.receiver
+    ? `${shortAddress(status.receiver)} (${status.receiverHandle})`
+    : shortAddress(status.receiver)
+  const title = status.kind === 'ready-to-transfer'
+    ? 'Transfer snapshot ready'
+    : 'Transfer snapshot received'
+  const detail = status.kind === 'ready-to-transfer'
+    ? 'sender can transfer externally'
+    : 'receiver can restore from this snapshot'
+  return (
+    <Box flexDirection="column">
+      <Text color={theme.accentPeriwinkle} bold>{title}</Text>
+      <Text>
+        <Text color={theme.dim}>{'Sender'.padEnd(12)}</Text>
+        <Text color={theme.text}>{shortAddress(status.sender)}</Text>
+      </Text>
+      <Text>
+        <Text color={theme.dim}>{'Receiver'.padEnd(12)}</Text>
+        <Text color={theme.text}>{receiverLabel}</Text>
+      </Text>
+      <Text color={theme.textSubtle}>{status.slotCount} decrypt slots · {detail}</Text>
+    </Box>
+  )
+}
+
+const LocalChangeStatusLine: React.FC<{ status: LocalChangeStatusView }> = ({ status }) => {
+  if (status.hasLocalChanges) {
+    return (
+      <Text color={theme.accentError} bold>
+        Local changes detected
+        {status.files.length > 0 ? `: ${status.files.join(', ')}` : ''}
+      </Text>
+    )
+  }
+
+  if (!status.detail) return null
+
+  const color = status.tone === 'ok' || status.tone === 'warn' ? theme.accentPeriwinkle : theme.dim
+  const label = status.detail === 'None detected' ? 'No local changes detected' : status.detail
+  return <Text color={color}>{label}</Text>
+}
+
+function displayValue(value: string): string {
+  const mapped = DISPLAY_VALUES[value]
+  return mapped ?? value
+}
+
+const DISPLAY_VALUES: Record<string, string> = {
+  'not attached': 'Not Attached',
+  'not connected': 'Not Connected',
+  'not created': 'Not Created',
+  'not saved': 'Not Saved',
+  'not saved yet': 'Not Saved Yet',
+  'never': 'Never',
+  'unknown': 'Unknown',
+  'ethereum mainnet': 'Ethereum Mainnet',
+  'base': 'Base',
+}

package/src/identity/hub/components/MenuScreen.tsx

@@ -0,0 +1,237 @@
+import React from 'react'
+import { Box, Text } from 'ink'
+import { Surface } from '../../../ui/Surface.js'
+import { Select, type SelectOption } from '../../../ui/Select.js'
+import { theme } from '../../../ui/theme.js'
+import type { EthagentConfig, EthagentIdentity } from '../../../storage/config.js'
+import type { ContinuityWorkingTreeStatus } from '../../continuity/storage.js'
+import { identityPerspective, readCustodyMode } from '../model/custody.js'
+import { identityValuesCopyHint } from '../model/copy.js'
+import { transferSnapshotView } from '../model/transfer.js'
+import { IdentitySummary } from './IdentitySummary.js'
+import type { AgentReconciliation } from '../reconciliation/index.js'
+import { menuFlagsFromReconciliation } from './menuFlagsFromReconciliation.js'
+
+type MenuScreenProps = {
+  mode: 'first-run' | 'manage'
+  config?: EthagentConfig
+  identity?: EthagentIdentity
+  workingStatus?: ContinuityWorkingTreeStatus | null
+  canRebackup: boolean
+  reconciliation?: AgentReconciliation
+  footer: React.ReactNode
+  onCreate: () => void
+  onLoad: () => void
+  onBackupNow: () => void
+  onRefetchLatest: () => void
+  onPublicProfile: () => void
+  onEnsName: () => void
+  onWalletSetup: () => void
+  onContinuity: () => void
+  onIdentityValues: () => void
+  onPrepareTransfer: () => void
+  onStorage: () => void
+  onSkip: () => void
+  onCancel: () => void
+}
+
+type Action =
+  | 'public-profile'
+  | 'ens-name'
+  | 'wallet-setup'
+  | 'continuity'
+  | 'backup'
+  | 'refetch'
+  | 'identity-values'
+  | 'prepare-transfer'
+  | 'storage'
+  | 'create'
+  | 'load'
+  | 'skip'
+  | 'cancel'
+
+export const MenuScreen: React.FC<MenuScreenProps> = ({
+  mode,
+  config,
+  identity,
+  workingStatus,
+  canRebackup,
+  reconciliation,
+  footer,
+  onCreate,
+  onLoad,
+  onBackupNow,
+  onRefetchLatest,
+  onPublicProfile,
+  onEnsName,
+  onWalletSetup,
+  onContinuity,
+  onIdentityValues,
+  onPrepareTransfer,
+  onStorage,
+  onSkip,
+  onCancel,
+}) => {
+  const title = mode === 'first-run' ? 'Set Up Agent Identity' : 'Identity Hub'
+  const subtitle = mode === 'first-run'
+    ? 'Create a portable agent or load one you already own.'
+    : 'Manage agent identity, custody, encrypted continuity, and recovery.'
+
+  const canRefetch = Boolean(canRebackup && identity?.backup?.cid)
+  const custodyMode = identity ? readCustodyMode(identity.state) : undefined
+
+  const perspective = identityPerspective(identity)
+  const flags = reconciliation
+    ? menuFlagsFromReconciliation(reconciliation, perspective)
+    : (perspective === 'operator'
+      ? menuFlagsFromReconciliation({
+          token: 'unknown', custody: 'unknown', agentUri: 'unknown', ensRecords: 'unknown',
+          vault: 'unknown', workingTree: 'unknown', rpc: 'reachable', driftCount: 0, lastCheckedAt: '',
+        }, perspective)
+      : null)
+
+  const walletSetupBaseHint = custodyMode === 'advanced'
+    ? 'Advanced. Owner wallet, agent vault, authorized operator wallets'
+    : 'Simple. Switch to Advanced to delegate URI rotation through a dedicated OperatorVault'
+
+  const walletSetupLabel = flags?.custodyAsterisk ? 'Custody Mode *' : 'Custody Mode'
+  const walletSetupHint = flags?.custodyModeReason ?? flags?.custodyHint ?? walletSetupBaseHint
+
+  const saveSnapshotLabel = flags?.saveSnapshotAsterisk ? 'Save Snapshot Now *' : 'Save Snapshot Now'
+  const saveSnapshotHint = flags?.saveSnapshotHint ?? 'Encrypt and publish latest snapshot'
+
+  const ensNameHint = flags?.ensNameReason ?? 'Public name or subdomain for this agent'
+
+  const prepareTransferHint = flags?.prepareTransferReason ?? 'Create transfer snapshot and handoff slots'
+
+  const tokenValuesHint = flags?.tokenValuesUnlinkedNote ?? identityValuesCopyHint(identity)
+
+  const options: Array<SelectOption<Action>> = identity
+    ? [
+        { value: 'public-profile', role: 'section', label: 'Public Identity' },
+        { value: 'public-profile', label: 'Public Profile', hint: 'Name, description, icon, and Agent Card' },
+        { value: 'ens-name', label: 'ENS Name', hint: ensNameHint, disabled: flags?.ensNameDisabled ?? false },
+        { value: 'continuity', role: 'section', label: 'Continuity' },
+        { value: 'continuity', label: 'Soul, Memory, Skills', hint: 'SOUL.md, MEMORY.md, skills.json on this device' },
+        { value: 'backup', label: saveSnapshotLabel, hint: saveSnapshotHint, disabled: !canRebackup || (flags?.saveSnapshotDisabled ?? false) },
+        { value: 'refetch', label: 'Refetch Latest', hint: 'Restore local files from latest saved snapshot', disabled: !canRefetch || (flags?.refetchLatestDisabled ?? false) },
+        { value: 'wallet-setup', role: 'section', label: 'Custody' },
+        { value: 'wallet-setup', label: walletSetupLabel, hint: walletSetupHint, disabled: !identity.agentId || (flags?.custodyModeDisabled ?? false) },
+        { value: 'prepare-transfer', label: 'Prepare Transfer', hint: prepareTransferHint, disabled: flags?.prepareTransferDisabled ?? false },
+        { value: 'identity-values', role: 'section', label: 'Token' },
+        { value: 'identity-values', label: 'Token Values', hint: tokenValuesHint },
+        { value: 'load', label: 'Load Agent', hint: 'Refresh this agent from chain, or load a different one' },
+        { value: 'create', label: 'New Agent', hint: 'Mint another token and make it active' },
+        { value: 'storage', role: 'section', label: 'Storage' },
+        { value: 'storage', label: 'IPFS Storage', hint: 'Publishing credentials for encrypted snapshots' },
+        { value: 'cancel', role: 'section', label: 'Exit' },
+        { value: 'cancel', label: 'Close Identity Hub', hint: 'Return to chat without changing identity', role: 'utility' },
+      ]
+    : [
+        { value: 'create', role: 'section', label: 'Setup' },
+        { value: 'create', label: 'Create New Agent', hint: 'Mint a wallet-owned token for this machine' },
+        { value: 'load', label: 'Load Existing Agent', hint: 'Find a token owned by this wallet or linked to it' },
+        { value: mode === 'first-run' ? 'skip' : 'cancel', role: 'section', label: 'Exit' },
+        ...(mode === 'first-run'
+          ? [
+              { value: 'skip' as Action, label: 'Skip For Now', hint: 'Continue now, use /identity later', role: 'utility' as const },
+            ]
+          : [
+              { value: 'cancel' as Action, label: 'Close Identity Hub', hint: 'Return to chat without changing identity', role: 'utility' as const },
+            ]),
+      ]
+
+  const reconciliationBanner = identity && reconciliation
+    ? renderReconciliationBanner(reconciliation, identity)
+    : null
+
+  return (
+    <Surface title={title} subtitle={subtitle} footer={footer}>
+      <IdentitySummary
+        identity={identity}
+        config={config}
+        workingStatus={workingStatus}
+        tokenLinked={reconciliation ? reconciliation.token === 'linked' : true}
+        {...(reconciliation?.onChainOwner ? { onchainOwner: reconciliation.onChainOwner } : {})}
+      />
+      {reconciliationBanner ? (
+        <Box marginTop={1} flexDirection="column">
+          {reconciliationBanner}
+        </Box>
+      ) : null}
+      <Box marginTop={1}>
+        <Select<Action>
+          options={options}
+          hintLayout="inline"
+          onSubmit={choice => {
+            if (choice === 'skip') return onSkip()
+            if (choice === 'cancel') return onCancel()
+            if (choice === 'public-profile') return onPublicProfile()
+            if (choice === 'ens-name') return onEnsName()
+            if (choice === 'wallet-setup') return onWalletSetup()
+            if (choice === 'continuity') return onContinuity()
+            if (choice === 'backup') return onBackupNow()
+            if (choice === 'refetch') return onRefetchLatest()
+            if (choice === 'identity-values') return onIdentityValues()
+            if (choice === 'prepare-transfer') return onPrepareTransfer()
+            if (choice === 'storage') return onStorage()
+            if (choice === 'load') return onLoad()
+            if (choice === 'create') return onCreate()
+          }}
+          onCancel={mode === 'first-run' ? undefined : onCancel}
+        />
+      </Box>
+    </Surface>
+  )
+}
+
+function renderReconciliationBanner(r: AgentReconciliation, identity: EthagentIdentity): React.ReactNode {
+  if (r.token === 'no-agent') return null
+  if (r.token === 'unlinked') {
+    const tokenLabel = r.tokenAgentId ? `Token #${r.tokenAgentId}` : 'Token'
+    const transferSnapshot = transferSnapshotView(identity)
+    if (transferSnapshot) {
+      return (
+        <>
+          <Text color={theme.accentError} bold>Agent Unlinked</Text>
+          <Text color={theme.textSubtle}>{tokenLabel} was transferred. Local SOUL.md, MEMORY.md, skills.json remain. Back them up before this directory is reused.</Text>
+          <Text color={theme.textSubtle}>Use Load Agent or New Agent to re-enable disabled actions.</Text>
+        </>
+      )
+    }
+    return (
+      <>
+        <Text color={theme.accentError} bold>Agent Unlinked</Text>
+        <Text color={theme.textSubtle}>{tokenLabel} left without Prepare Transfer. Back up local SOUL.md, MEMORY.md, skills.json before loading another agent.</Text>
+        <Text color={theme.textSubtle}>For continuity handoff: ask the new holder to return the token, then run Prepare Transfer before re-sending.</Text>
+        <Text color={theme.textSubtle}>Use Load Agent or New Agent to re-enable disabled actions.</Text>
+      </>
+    )
+  }
+  if (r.token === 'unknown') {
+    return (
+      <>
+        <Text color={theme.dim}>Ownership Check Failed (RPC?)</Text>
+        {r.tokenDetail ? <Text color={theme.dim}>{r.tokenDetail}</Text> : null}
+      </>
+    )
+  }
+  if (r.driftCount === 0) {
+    return null
+  }
+  const lines: string[] = []
+  if (r.custody === 'mid-flow-uri-pending') lines.push('Advanced setup pending. Open Custody Mode to finish.')
+  if (r.agentUri === 'local-newer') lines.push('Local state newer than chain. Save Snapshot Now to publish.')
+  if (r.agentUri === 'chain-newer') lines.push('Onchain agentURI is newer than local. Refetch Latest.')
+  if (r.ensRecords === 'drift') lines.push('ENS records out of sync. Open Custody Mode to Fix Records.')
+  if (r.vault === 'missing') lines.push('Recorded vault address has no contract at it. Open Custody Mode to redeploy.')
+  if (r.workingTree === 'dirty') lines.push('Local edits pending. Save Snapshot Now to publish.')
+  return (
+    <>
+      <Text color={theme.accentPeriwinkle} bold>Agent Linked. {lines.length} item{lines.length === 1 ? '' : 's'} need attention</Text>
+      {lines.map((line, i) => (
+        <Text key={i} color={theme.textSubtle}>· {line}</Text>
+      ))}
+    </>
+  )
+}

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

@@ -3,7 +3,7 @@ import { Surface } from '../../../ui/Surface.js'
 import { Select, type SelectOption } from '../../../ui/Select.js'
 import type { SelectableNetwork } from '../../../storage/config.js'
 import { SELECTABLE_NETWORKS } from '../../../storage/config.js'
-import { networkLabel, networkSubtitle } from '../identityHubModel.js'
+import { networkLabel, networkSubtitle } from '../model/network.js'
 
 type NetworkScreenProps = {
   subtitle: string
@@ -14,9 +14,9 @@ type NetworkScreenProps = {
 
 export const NetworkScreen: React.FC<NetworkScreenProps> = ({ subtitle, footer, onSelect, onCancel }) => {
   const options: Array<SelectOption<SelectableNetwork>> = [
-    { value: 'mainnet', role: 'section', prefix: '--', label: 'Main Network' },
+    { value: 'mainnet', role: 'section', label: 'High Security' },
     networkOption('mainnet'),
-    { value: 'arbitrum', role: 'section', prefix: '--', label: 'Lower-Fee Networks' },
+    { value: 'base', role: 'section', label: 'Lower Cost' },
     ...SELECTABLE_NETWORKS.filter(network => network !== 'mainnet').map(networkOption),
   ]
 

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

@@ -4,34 +4,38 @@ import { Surface } from '../../../ui/Surface.js'
 import { TextInput } from '../../../ui/TextInput.js'
 import { theme } from '../../../ui/theme.js'
 import { extractPinataJwt } from '../../storage/ipfs.js'
-import type { Step } from '../identityHubReducer.js'
 
 const PINATA_API_KEYS_URL = 'https://app.pinata.cloud/developers/api-keys'
 
-type RebackupStorageScreenProps = {
-  step: Extract<Step, { kind: 'rebackup-storage' | 'public-profile-storage' }>
+type PinataJwtInputProps = {
+  inputKey: string
+  title?: string
+  subtitle?: string
   footer: React.ReactNode
   onSubmit: (input: string) => void
   onCancel: () => void
 }
 
-export const RebackupStorageScreen: React.FC<RebackupStorageScreenProps> = ({ step, footer, onSubmit, onCancel }) => {
-  const publicOnly = step.kind === 'public-profile-storage'
-  return (
-    <Surface
-      title="Connect IPFS Storage"
-      subtitle={step.error ?? (publicOnly
-        ? 'Save a Pinata JWT so ethagent can pin public profile metadata to IPFS.'
-        : 'Save a Pinata JWT so ethagent can pin encrypted state to IPFS.')}
-      footer={footer}
-    >
+export const PinataJwtInput: React.FC<PinataJwtInputProps> = ({
+  inputKey,
+  title,
+  subtitle,
+  footer,
+  onSubmit,
+  onCancel,
+}) => (
+  <Surface
+    title={title ?? 'Connect IPFS Storage'}
+    subtitle={subtitle ?? 'Save a Pinata JWT so ethagent can pin encrypted state to IPFS.'}
+    footer={footer}
+  >
     <Text>
       <Text color={theme.dim}>Paste your Pinata JWT. Get one at </Text>
-      <Text color={theme.accentPrimary} underline>{PINATA_API_KEYS_URL}</Text>
+      <Text color={theme.accentPeriwinkle} underline>{PINATA_API_KEYS_URL}</Text>
     </Text>
     <Text color={theme.dim}>Saved encrypted on this device · used only for IPFS pinning</Text>
     <TextInput
-      key="rebackup-storage"
+      key={inputKey}
       isSecret
       placeholder="Pinata JWT"
       validate={v => {
@@ -45,6 +49,5 @@ export const RebackupStorageScreen: React.FC<RebackupStorageScreenProps> = ({ st
       onSubmit={onSubmit}
       onCancel={onCancel}
     />
-    </Surface>
-  )
-}
+  </Surface>
+)

package/src/identity/hub/components/UnlinkedIdentityScreen.tsx

@@ -0,0 +1,76 @@
+import React from 'react'
+import { Box, Text } from 'ink'
+import { Surface } from '../../../ui/Surface.js'
+import { Select } from '../../../ui/Select.js'
+import { theme } from '../../../ui/theme.js'
+import { transferSnapshotView } from '../model/transfer.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
+
+type UnlinkedIdentityScreenProps = {
+  identity?: EthagentIdentity
+  agentId?: string
+  onLoadAgent: () => void
+  onOpenMenu: () => void
+  onRetry?: () => void
+  onCancel: () => void
+}
+
+type Action = 'load-agent' | 'open-menu' | 'retry'
+
+export const UnlinkedIdentityScreen: React.FC<UnlinkedIdentityScreenProps> = ({
+  identity,
+  agentId,
+  onLoadAgent,
+  onOpenMenu,
+  onRetry,
+  onCancel,
+}) => {
+  const options: Array<{ value: Action; label: string; hint?: string; role?: 'section' | 'utility' }> = [
+    { value: 'load-agent', role: 'section', label: 'Load Agent' },
+    { value: 'load-agent', label: 'Load Agent', hint: 'Reconnect this token by signing with the current owner wallet, or load a different one' },
+    { value: 'open-menu', role: 'section', label: 'Identity Hub' },
+    { value: 'open-menu', label: 'Open Identity Hub', hint: 'Browse local identity, continuity files, and settings without reconnecting' },
+  ]
+  if (onRetry) {
+    options.push({ value: 'retry', role: 'section', label: 'Recheck' })
+    options.push({ value: 'retry', label: 'Retry Ownership Check', hint: 'Re-query the chain to confirm the current owner', role: 'utility' })
+  }
+
+  const tokenLabel = agentId ? `Token #${agentId}` : 'Token'
+  const transferSnapshot = transferSnapshotView(identity)
+
+  return (
+    <Surface
+      title="No Linked Agent"
+      subtitle="The agent token recorded locally is not currently owned by your wallet."
+      footer={<Text color={theme.dim}>enter selects, esc back</Text>}
+    >
+      <Box flexDirection="column">
+        {transferSnapshot ? (
+          <Text color={theme.textSubtle}>
+            {tokenLabel} was transferred. Local SOUL.md, MEMORY.md, skills.json remain. Back them up before this directory is reused.
+          </Text>
+        ) : (
+          <>
+            <Text color={theme.accentPeriwinkle}>{tokenLabel} left this wallet without Prepare Transfer, so the new holder has no continuity handoff.</Text>
+            <Text color={theme.textSubtle}>
+              Local SOUL.md, MEMORY.md, skills.json remain. Back them up before this directory is reused.
+            </Text>
+          </>
+        )}
+      </Box>
+      <Box marginTop={1}>
+        <Select<Action>
+          options={options}
+          hintLayout="inline"
+          onSubmit={choice => {
+            if (choice === 'load-agent') return onLoadAgent()
+            if (choice === 'open-menu') return onOpenMenu()
+            if (choice === 'retry') return onRetry?.()
+          }}
+          onCancel={onCancel}
+        />
+      </Box>
+    </Surface>
+  )
+}

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

@@ -1,26 +1,28 @@
 import React from 'react'
 import { Box, Text } from 'ink'
-import { exec } from 'node:child_process'
 import { Surface } from '../../../ui/Surface.js'
 import { Spinner } from '../../../ui/Spinner.js'
 import { theme } from '../../../ui/theme.js'
 import { useAppInput } from '../../../app/input/AppInputProvider.js'
+import { openExternalUrl } from '../../../utils/openExternal.js'
 import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
 
 type WalletApprovalScreenProps = {
   title: string
-  subtitle: string
+  subtitle: React.ReactNode
   walletSession: BrowserWalletReady | null
   label: string
   onCancel?: () => void
 }
 
+export const OPEN_BROWSER_HINT = 'Press enter to open in browser...'
+const PREPARING_WALLET_REQUEST_LABEL = 'preparing wallet request...'
+
 export const WalletApprovalScreen: React.FC<WalletApprovalScreenProps> = ({ title, subtitle, walletSession, label, onCancel }) => {
   useAppInput((_input, key) => {
     if (key.escape && onCancel) onCancel()
     if (key.return && walletSession?.url) {
-      const command = process.platform === 'win32' ? 'start ""' : process.platform === 'darwin' ? 'open' : 'xdg-open'
-      exec(`${command} "${walletSession.url}"`).on('error', () => {})
+      openExternalUrl(walletSession.url)
     }
   }, { isActive: Boolean(onCancel) || Boolean(walletSession) })
   const footer = onCancel ? <Text color={theme.dim}>esc cancels</Text> : undefined
@@ -28,15 +30,14 @@ export const WalletApprovalScreen: React.FC<WalletApprovalScreenProps> = ({ titl
     <Surface title={title} subtitle={subtitle} footer={footer}>
       {walletSession ? (
         <Box flexDirection="column">
-          <Text color={theme.dim}>open this approval page</Text>
-          <Text color={theme.accentPrimary}>{walletSession.url}</Text>
-          <Text color={theme.dim}>press enter to open in browser...</Text>
+          <Text color={theme.accentBlue} underline>{walletSession.url}</Text>
+          <Text color={theme.dim}>{OPEN_BROWSER_HINT}</Text>
           <Box marginTop={1}>
             <Spinner label={label} />
           </Box>
         </Box>
       ) : (
-        <Spinner label="preparing wallet approval..." />
+        <Spinner label={PREPARING_WALLET_REQUEST_LABEL} />
       )}
     </Surface>
   )