ethagent 2.4.0 → 3.0.1

package/src/identity/hub/restore/RestoreFlow.tsx

@@ -1,8 +1,9 @@
 import React from 'react'
-import { Text } from 'ink'
+import { Box, Text } from 'ink'
 import { Surface } from '../../../ui/Surface.js'
 import { Select } from '../../../ui/Select.js'
 import { TextInput } from '../../../ui/TextInput.js'
+import { Spinner } from '../../../ui/Spinner.js'
 import { theme } from '../../../ui/theme.js'
 import { normalizeErc8004RegistryConfig } from '../../registry/erc8004.js'
 import {
@@ -18,7 +19,7 @@ import { WalletApprovalScreen } from '../shared/components/WalletApprovalScreen.
 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 { restoreSignatureRequestForStep } from './auth.js'
 import type { RestoreProgress } from '../shared/effects/types.js'
 
 type RestoreStep = Exclude<Extract<Step, { kind: `restore-${string}` }>, { kind: 'restore-wallet' | 'restore-network' }>
@@ -122,11 +123,24 @@ export const RestoreFlow: React.FC<RestoreFlowProps> = ({
   }
 
   if (step.kind === 'restore-ens-input') {
+    if (step.busy) {
+      return (
+        <Surface
+          title={isSwitch ? 'Load Agent' : 'Restore Agent'}
+          subtitle="Looking up the agent onchain."
+          footer={footerHint('esc cancels')}
+        >
+          <Box marginTop={1}>
+            <Spinner label="looking up ENS name onchain..." />
+          </Box>
+        </Surface>
+      )
+    }
     return (
       <Surface
         title={isSwitch ? 'Load Agent' : 'Restore Agent'}
         subtitle="Enter the agent's ENS name to decrypt with an authorized operator wallet."
-        footer={footerHint(step.busy ? 'Looking up...' : 'enter continue · esc back')}
+        footer={footerHint('enter continue · esc back')}
       >
         <Text color={theme.dim}>The full agent subdomain, e.g. agent.example.eth.</Text>
         <TextInput
@@ -134,17 +148,35 @@ export const RestoreFlow: React.FC<RestoreFlowProps> = ({
           onSubmit={value => onEnsSubmit(value.trim())}
           onCancel={onBack}
         />
-        {step.error ? <Text color={theme.accentError}>{step.error}</Text> : null}
+        {step.error ? (
+          <Box marginTop={1} flexDirection="column">
+            <Text color={theme.accentError}>Could not resolve ENS name</Text>
+            <Text color={theme.textSubtle}>{step.error}</Text>
+          </Box>
+        ) : null}
       </Surface>
     )
   }
 
   if (step.kind === 'restore-token-id-input') {
+    if (step.busy) {
+      return (
+        <Surface
+          title={isSwitch ? 'Load Agent' : 'Restore Agent'}
+          subtitle="Looking up the agent onchain."
+          footer={footerHint('esc cancels')}
+        >
+          <Box marginTop={1}>
+            <Spinner label="looking up token onchain..." />
+          </Box>
+        </Surface>
+      )
+    }
     return (
       <Surface
         title={isSwitch ? 'Load Agent' : 'Restore Agent'}
         subtitle={`Enter the ERC-8004 token ID on ${networkLabelForRegistry(step.registry)}.`}
-        footer={footerHint(step.busy ? 'Looking up...' : 'enter continue · esc back')}
+        footer={footerHint('enter continue · esc back')}
       >
         <Text color={theme.dim}>The integer token ID assigned at mint.</Text>
         <TextInput
@@ -152,7 +184,12 @@ export const RestoreFlow: React.FC<RestoreFlowProps> = ({
           onSubmit={value => onTokenIdSubmit(value.trim())}
           onCancel={onBack}
         />
-        {step.error ? <Text color={theme.accentError}>{step.error}</Text> : null}
+        {step.error ? (
+          <Box marginTop={1} flexDirection="column">
+            <Text color={theme.accentError}>Could not resolve token</Text>
+            <Text color={theme.textSubtle}>{step.error}</Text>
+          </Box>
+        ) : null}
       </Surface>
     )
   }

package/src/identity/hub/restore/apply.ts

@@ -5,7 +5,12 @@ import {
   restoreContinuitySnapshotEnvelope,
   transferSnapshotMetadataFromEnvelope,
 } from '../../continuity/envelope.js'
-import { ensureIdentityMarkdownScaffold, writeContinuityFiles } from '../../continuity/storage.js'
+import {
+  ensureIdentityMarkdownScaffold,
+  restoreSkillsTree,
+  writeContinuityFiles,
+} from '../../continuity/storage.js'
+import { syncPublicSkillsManifest } from '../../continuity/skills/publicSkillsSync.js'
 import { recordPublishedContinuitySnapshot } from '../../continuity/snapshots.js'
 import { requestBrowserWalletSignature } from '../../wallet/browserWallet.js'
 import { setVaultAddressField } from '../../identityCompat.js'
@@ -31,6 +36,7 @@ export async function runRestoreAuthorize(
   callbacks.onRestoreProgress?.({ phase: 'decrypting', label: 'signature received · decrypting encrypted snapshot...' })
   let restored: ReturnType<typeof restoreAgentStateBackupEnvelope> | ReturnType<typeof restoreContinuitySnapshotEnvelope>
   let continuityFiles: ReturnType<typeof restoreContinuitySnapshotEnvelope>['files'] | undefined
+  let continuitySkills: ReturnType<typeof restoreContinuitySnapshotEnvelope>['skills']
   if (isContinuitySnapshotEnvelope(step.envelope)) {
     const payload = restoreContinuitySnapshotEnvelope({
       envelope: step.envelope,
@@ -39,6 +45,7 @@ export async function runRestoreAuthorize(
     })
     restored = payload
     continuityFiles = payload.files
+    continuitySkills = payload.skills
   } else {
     restored = restoreAgentStateBackupEnvelope({
       envelope: step.envelope,
@@ -104,9 +111,13 @@ export async function runRestoreAuthorize(
   if (continuityFiles) {
     await writeContinuityFiles(nextIdentity, continuityFiles)
   }
+  if (continuitySkills) {
+    await restoreSkillsTree(nextIdentity, continuitySkills)
+  }
   callbacks.onRestoreProgress?.({ phase: 'finishing', label: 'finalizing restored identity...' })
   await restorePublishedPublicSkills(nextIdentity, step.apiUrl, step.candidate.publicDiscovery?.skillsCid)
   await ensureIdentityMarkdownScaffold(nextIdentity)
+  await syncPublicSkillsManifest(nextIdentity).catch(() => null)
   await recordPublishedContinuitySnapshot({ identity: nextIdentity, label: 'restored from agent backup' }).catch(() => null)
   await callbacks.onIdentityComplete(nextIdentity, `ERC-8004 agent restored · #${step.candidate.agentId.toString()}`, 'restore')
 }

package/src/identity/hub/restore/recovery.ts

@@ -6,7 +6,13 @@ import {
   restoreContinuitySnapshotEnvelope,
   transferSnapshotMetadataFromEnvelope,
 } from '../../continuity/envelope.js'
-import { ensureIdentityMarkdownScaffold, localContinuitySnapshotContentHashes, writeContinuityFiles } from '../../continuity/storage.js'
+import {
+  ensureIdentityMarkdownScaffold,
+  localContinuitySnapshotContentHashes,
+  restoreSkillsTree,
+  writeContinuityFiles,
+} from '../../continuity/storage.js'
+import { syncPublicSkillsManifest } from '../../continuity/skills/publicSkillsSync.js'
 import { recordPublishedContinuitySnapshot, updatePublishedContinuitySnapshotContentHashes } from '../../continuity/snapshots.js'
 import { catFromIpfs, DEFAULT_IPFS_API_URL } from '../../storage/ipfs.js'
 import {
@@ -72,7 +78,7 @@ export async function runRecoveryRefetch(
     walletSignature: wallet.signature,
     currentOwnerAddress: getAddress(wallet.account),
   })
-  callbacks.onRestoreProgress?.({ phase: 'writing', label: 'restoring SOUL.md, MEMORY.md, and skills.json...' })
+  callbacks.onRestoreProgress?.({ phase: 'writing', label: 'restoring SOUL.md, MEMORY.md, and skills...' })
   const transferSnapshot = transferSnapshotMetadataFromEnvelope(envelope)
   const refreshedBackup: BackupMetadata = {
     cid: candidate.backup.cid,
@@ -123,13 +129,17 @@ export async function runRecoveryRefetch(
     } : {}),
   }
   await writeContinuityFiles(nextIdentity, payload.files)
+  if (payload.skills) {
+    await restoreSkillsTree(nextIdentity, payload.skills)
+  }
   callbacks.onRestoreProgress?.({ phase: 'finishing', label: 'finalizing refreshed identity...' })
   const publicSkillsRestored = await restorePublishedPublicSkills(nextIdentity, apiUrl, candidate.publicDiscovery?.skillsCid)
   await ensureIdentityMarkdownScaffold(nextIdentity)
-  await recordPublishedContinuitySnapshot({ identity: nextIdentity, label: 'Refetched Latest Snapshot From Chain' }).catch(() => null)
+  await syncPublicSkillsManifest(nextIdentity).catch(() => null)
+  await recordPublishedContinuitySnapshot({ identity: nextIdentity, label: 'Refetched Latest Snapshot From Onchain' }).catch(() => null)
   if (publicSkillsRestored) {
     const contentHashes = await localContinuitySnapshotContentHashes(nextIdentity)
     await updatePublishedContinuitySnapshotContentHashes(nextIdentity, candidate.backup.cid, contentHashes).catch(() => null)
   }
-  await callbacks.onIdentityComplete(nextIdentity, 'Latest Published Snapshot Restored From Chain', 'update')
+  await callbacks.onIdentityComplete(nextIdentity, 'Latest Published Snapshot Restored From Onchain', 'update')
 }

package/src/identity/hub/restore/resolve.ts

@@ -29,7 +29,7 @@ export async function resolveAgentEnsToCandidate(
     return { ok: false, message: `Could not reach Ethereum mainnet to resolve ${trimmed}: ${err instanceof Error ? err.message : String(err)}` }
   }
   const tokenValue = records[AGENT_RECORD_KEYS.token]
-  if (!tokenValue) return { ok: false, message: `${trimmed} has no org.ethagent.token record. Use the full agent subdomain (e.g. agent.${trimmed}).` }
+  if (!tokenValue) return { ok: false, message: `${trimmed} has no org.ethagent.token record.` }
   const tokenRef = parseAgentTokenReference(tokenValue)
   if (!tokenRef) return { ok: false, message: `${trimmed}'s org.ethagent.token record is not a valid eip155 reference.` }
   if (tokenRef.chainId !== registry.chainId) {

package/src/identity/hub/restore/useRestoreEffects.ts

@@ -1,11 +1,9 @@
 import { useEffect } from 'react'
 import type { EthagentConfig } from '../../../storage/config.js'
-import {
-  runRestoreAuthorize,
-  runRestoreConnectWallet,
-  runRestoreDiscover,
-  runRestoreFetch,
-} from './index.js'
+import { runRestoreAuthorize } from './apply.js'
+import { runRestoreConnectWallet } from './auth.js'
+import { runRestoreDiscover } from './discover.js'
+import { runRestoreFetch } from './fetch.js'
 import type { EffectCallbacks } from '../shared/effects/types.js'
 import type { Step } from '../identityHubReducer.js'
 

package/src/identity/hub/shared/components/DetailsScreen.tsx

@@ -6,12 +6,14 @@ import { Select, type SelectOption } from '../../../../ui/Select.js'
 import type { EthagentConfig, EthagentIdentity } from '../../../../storage/config.js'
 import { copyableIdentityFields, identityValuesCopyHint } from '../model/copy.js'
 import { IdentitySummary } from './IdentitySummary.js'
+import type { ContinuityWorkingTreeStatus } from '../../../continuity/storage.js'
 
 type CopyAction = `copy:${string}` | 'back'
 
 type DetailsScreenProps = {
   identity?: EthagentIdentity
   config?: EthagentConfig
+  workingStatus?: ContinuityWorkingTreeStatus | null
   copyNotice?: string | null
   unlinked?: boolean
   onchainOwner?: string
@@ -23,6 +25,7 @@ type DetailsScreenProps = {
 export const DetailsScreen: React.FC<DetailsScreenProps> = ({
   identity,
   config,
+  workingStatus,
   copyNotice,
   unlinked,
   onchainOwner,
@@ -45,7 +48,7 @@ export const DetailsScreen: React.FC<DetailsScreenProps> = ({
 
   return (
     <Surface title="Token Values" subtitle={unlinked ? 'Token no longer linked to this wallet, values retained for reference.' : `${identityValuesCopyHint(identity)}.`} footer={footer}>
-      <IdentitySummary identity={identity} config={config} onchainOwner={onchainOwner} />
+      <IdentitySummary identity={identity} config={config} workingStatus={workingStatus} onchainOwner={onchainOwner} />
       {copyNotice ? <Text color={theme.accentPeriwinkle} bold>{copyNotice}</Text> : null}
       <Box marginTop={1}>
         <Select<CopyAction>

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

@@ -28,9 +28,10 @@ interface IdentitySummaryProps {
   hideHeader?: boolean
   tokenLinked?: boolean
   onchainOwner?: string
+  compact?: boolean
 }
 
-export const IdentitySummary: React.FC<IdentitySummaryProps> = ({ identity, config, workingStatus, hideLocalChanges = false, hideHeader = false, tokenLinked = true, onchainOwner }) => {
+export const IdentitySummary: React.FC<IdentitySummaryProps> = ({ identity, config, workingStatus, hideLocalChanges = false, hideHeader = false, tokenLinked = true, onchainOwner, compact = false }) => {
   if (!identity) {
     return (
       <Text color={theme.dim}>No agent yet. Create or load one.</Text>
@@ -59,6 +60,25 @@ export const IdentitySummary: React.FC<IdentitySummaryProps> = ({ identity, conf
     ? `${tokenValue} · ${displayValue(networkValue)}`
     : displayValue(tokenValue)
 
+  if (compact) {
+    const name = stateName || 'Active Agent'
+    const tokenSegment = identity.agentId ? `#${identity.agentId}` : null
+    const networkSegment = identity.agentId ? displayValue(networkValue) : null
+    const ensSegment = ensStatus.kind === 'linked'
+      ? ensStatus.name
+      : ensStatus.kind === 'issue'
+        ? ensStatus.name
+        : null
+    return (
+      <Text>
+        <Text color={theme.accentPeriwinkle} bold>{name}</Text>
+        {tokenSegment ? <><Text color={theme.dim}> · </Text><Text color={theme.text}>{tokenSegment}</Text></> : null}
+        {networkSegment ? <><Text color={theme.dim}> · </Text><Text color={theme.text}>{networkSegment}</Text></> : null}
+        {ensSegment ? <><Text color={theme.dim}> · </Text><Text color={ensStatus.kind === 'issue' ? theme.accentError : theme.accentPeriwinkle}>{ensSegment}</Text></> : null}
+      </Text>
+    )
+  }
+
   return (
     <Box flexDirection="column">
       {hideHeader ? null : (
@@ -67,59 +87,67 @@ export const IdentitySummary: React.FC<IdentitySummaryProps> = ({ identity, conf
           <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}
+      <SummaryRow
+        left={{
+          label: 'ENS',
+          value: 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>,
+        }}
+        right={tokenLinked
+          ? {
+              label: 'Custody',
+              value: <Text color={custodyMode ? theme.text : theme.dim}>{displayCustodyMode(custodyMode)}</Text>,
+            }
+          : undefined}
+      />
       {(() => {
-        if (custodyMode !== 'advanced') return null
-        const vaultAddress = readIdentityStateString(identity.state, 'operatorVaultAddress')
-        if (!vaultAddress) return null
+        const vaultAddress = custodyMode === 'advanced'
+          ? readIdentityStateString(identity.state, 'operatorVaultAddress')
+          : undefined
+        const pairedOperatorsValue = custodyMode === 'advanced' && tokenLinked
+          ? approvedOperatorCount > 1
+            ? <Text color={theme.text}>{`${approvedOperatorCount} authorized`}</Text>
+            : activeOperator
+              ? <Text color={theme.text}>{shortAddress(activeOperator)}</Text>
+              : <Text color={theme.dim}>None Authorized</Text>
+          : null
+        const lastSavedCell = {
+          label: 'Last Saved',
+          value: <Text color={lastBackup === 'never' ? theme.dim : theme.text}>{displayValue(lastBackup)}</Text>,
+        }
+        const pendingCell = {
+          label: 'Pending',
+          value: <Text color={theme.dim}>local ahead of onchain, owner rotates pointer</Text>,
+        }
         return (
-          <Text>
-            <Text color={theme.dim}>{'Vault'.padEnd(12)}</Text>
-            <Text color={theme.text}>{shortAddress(vaultAddress)}</Text>
-          </Text>
+          <>
+            {ownerAddress ? (
+              <SummaryRow
+                left={{
+                  label: 'Owner',
+                  value: <Text color={theme.text}>{shortAddress(ownerAddress)}</Text>,
+                }}
+                {...(pairedOperatorsValue
+                  ? { right: { label: 'Operators', value: pairedOperatorsValue } }
+                  : {})}
+              />
+            ) : null}
+            {vaultAddress ? (
+              <SummaryRow
+                left={{ label: 'Vault', value: <Text color={theme.text}>{shortAddress(vaultAddress)}</Text> }}
+                right={hasPendingPublish(identity) ? pendingCell : lastSavedCell}
+              />
+            ) : (
+              hasPendingPublish(identity)
+                ? <SummaryRow left={lastSavedCell} right={pendingCell} />
+                : <SummaryRow left={lastSavedCell} />
+            )}
+          </>
         )
       })()}
-      {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} />
@@ -134,6 +162,39 @@ export const IdentitySummary: React.FC<IdentitySummaryProps> = ({ identity, conf
   )
 }
 
+type SummaryCell = { label: string; value: React.ReactNode }
+
+const LEFT_LABEL_WIDTH = 12
+const LEFT_VALUE_WIDTH = 30
+const RIGHT_CELL_WIDTH = 36
+
+const SummaryRow: React.FC<{ left: SummaryCell; right?: SummaryCell }> = ({ left, right }) => {
+  if (!right) {
+    return (
+      <Text>
+        <Text color={theme.dim}>{left.label.padEnd(LEFT_LABEL_WIDTH)}</Text>
+        {left.value}
+      </Text>
+    )
+  }
+  return (
+    <Box flexDirection="row">
+      <Box width={LEFT_LABEL_WIDTH + LEFT_VALUE_WIDTH}>
+        <Text>
+          <Text color={theme.dim}>{left.label.padEnd(LEFT_LABEL_WIDTH)}</Text>
+          {left.value}
+        </Text>
+      </Box>
+      <Box width={RIGHT_CELL_WIDTH}>
+        <Text>
+          <Text color={theme.dim}>{right.label.padEnd(LEFT_LABEL_WIDTH)}</Text>
+          {right.value}
+        </Text>
+      </Box>
+    </Box>
+  )
+}
+
 const TransferSnapshotStatus: React.FC<{ status: NonNullable<TransferSnapshotView> }> = ({ status }) => {
   const receiverLabel = status.receiverHandle && status.receiverHandle !== status.receiver
     ? `${shortAddress(status.receiver)} (${status.receiverHandle})`
@@ -163,10 +224,13 @@ const TransferSnapshotStatus: React.FC<{ status: NonNullable<TransferSnapshotVie
 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>
+      <Box flexDirection="column">
+        <Text color={theme.accentError} bold>
+          Local changes detected
+          {status.files.length > 0 ? `: ${status.files.join(', ')}` : ''}
+        </Text>
+        <Text color={theme.dim}>Save Snapshot Now to publish.</Text>
+      </Box>
     )
   }
 

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

@@ -28,6 +28,7 @@ type MenuScreenProps = {
   onEnsName: () => void
   onWalletSetup: () => void
   onContinuity: () => void
+  onSkillsTree: () => void
   onIdentityValues: () => void
   onPrepareTransfer: () => void
   onStorage: () => void
@@ -40,6 +41,7 @@ type Action =
   | 'ens-name'
   | 'wallet-setup'
   | 'continuity'
+  | 'skills-tree'
   | 'backup'
   | 'refetch'
   | 'identity-values'
@@ -66,6 +68,7 @@ export const MenuScreen: React.FC<MenuScreenProps> = ({
   onEnsName,
   onWalletSetup,
   onContinuity,
+  onSkillsTree,
   onIdentityValues,
   onPrepareTransfer,
   onStorage,
@@ -91,47 +94,46 @@ export const MenuScreen: React.FC<MenuScreenProps> = ({
       : null)
 
   const walletSetupBaseHint = custodyMode === 'advanced'
-    ? 'Advanced. Owner wallet, Vault, authorized operator wallets'
-    : 'Simple. Switch to Advanced to delegate URI rotation through a dedicated Vault'
+    ? 'Owner wallet, vault, operators'
+    : 'Simple mode, switch for vault delegation'
 
   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 saveSnapshotLabel = flags?.saveSnapshotAsterisk ? 'Save Snapshot *' : 'Save Snapshot'
+  const saveSnapshotHint = flags?.saveSnapshotHint ?? 'Publish encrypted snapshot'
 
-  const ensNameHint = flags?.ensNameReason ?? 'Public name or subdomain for this agent'
+  const ensNameHint = flags?.ensNameReason ?? 'Public name or subdomain'
 
-  const prepareTransferHint = flags?.prepareTransferReason ?? 'Create transfer snapshot and handoff slots'
+  const prepareTransferHint = flags?.prepareTransferReason ?? 'Hand off this agent'
 
   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: 'public-profile', label: 'Public Profile', hint: 'Agent card and profile fields' },
         { 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: 'continuity', label: 'Soul & Memory', hint: 'Edit SOUL.md and MEMORY.md' },
+        { value: 'skills-tree', label: 'Skills', hint: 'Browse and edit SKILL.md files' },
         { 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: 'refetch', label: 'Refetch Snapshot', hint: 'Restore latest 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: 'load', label: 'Load Agent', hint: 'Refresh or load another agent' },
+        { value: 'create', label: 'New Agent', hint: 'Mint another agent' },
+        { value: 'storage', label: 'IPFS Storage', hint: 'Publishing credentials' },
         { value: 'cancel', role: 'section', label: 'Exit' },
-        { value: 'cancel', label: 'Close Identity Hub', hint: 'Return to chat without changing identity', role: 'utility' },
+        { value: 'cancel', label: 'Close Identity Hub', hint: 'Return to chat', 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 },
@@ -170,6 +172,7 @@ export const MenuScreen: React.FC<MenuScreenProps> = ({
             if (choice === 'ens-name') return onEnsName()
             if (choice === 'wallet-setup') return onWalletSetup()
             if (choice === 'continuity') return onContinuity()
+            if (choice === 'skills-tree') return onSkillsTree()
             if (choice === 'backup') return onBackupNow()
             if (choice === 'refetch') return onRefetchLatest()
             if (choice === 'identity-values') return onIdentityValues()
@@ -194,7 +197,7 @@ function renderReconciliationBanner(r: AgentReconciliation, identity: EthagentId
       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}>{tokenLabel} was transferred. Local SOUL.md, MEMORY.md, and skills 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>
         </>
       )
@@ -202,7 +205,7 @@ function renderReconciliationBanner(r: AgentReconciliation, identity: EthagentId
     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}>{tokenLabel} left without Prepare Transfer. Back up local SOUL.md, MEMORY.md, and skills 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>
       </>
@@ -221,7 +224,7 @@ function renderReconciliationBanner(r: AgentReconciliation, identity: EthagentId
   }
   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 === 'local-newer') lines.push('Local state newer than onchain. Save Snapshot Now to publish.')
   if (r.agentUri === 'chain-newer') lines.push('Onchain agentURI is newer than local. Refetch Latest.')
   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.')

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

@@ -33,7 +33,7 @@ export const UnlinkedIdentityScreen: React.FC<UnlinkedIdentityScreenProps> = ({
   ]
   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' })
+    options.push({ value: 'retry', label: 'Retry Ownership Check', hint: 'Re-query onchain to confirm the current owner', role: 'utility' })
   }
 
   const tokenLabel = agentId ? `Token #${agentId}` : 'Token'
@@ -43,18 +43,18 @@ export const UnlinkedIdentityScreen: React.FC<UnlinkedIdentityScreenProps> = ({
     <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>}
+      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.
+            {tokenLabel} was transferred. Local SOUL.md, MEMORY.md, and skills 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.
+              Local SOUL.md, MEMORY.md, and skills remain. Back them up before this directory is reused.
             </Text>
           </>
         )}