ethagent 3.3.4 → 4.0.0

package/src/identity/{hub → manager}/continuity/ContinuityDashboardScreen.tsx

@@ -38,8 +38,8 @@ export const PrivateContinuityScreen: React.FC<CommonProps & {
   onOpenMemory,
   onBack,
 }) => (
-  <Surface title="Soul & Memory" subtitle={notice ?? privateSubtitle(ready)} footer={footer}>
-    <IdentitySummary identity={identity} config={config} workingStatus={workingStatus} hideLocalChanges compact />
+  <Surface title="Soul & Memory" subtitle={notice ?? (!ready ? 'Run Refetch Latest to recover files.' : 'Persona and memory files.')} footer={footer}>
+    <IdentitySummary identity={identity} config={config} workingStatus={workingStatus} compact />
     {editorOpened && (
       <Box marginTop={1}>
         <Text color={theme.accentPeriwinkle}>Save with ctrl+s in your editor</Text>
@@ -48,11 +48,9 @@ export const PrivateContinuityScreen: React.FC<CommonProps & {
     <Box marginTop={1}>
       <Select<PrivateAction>
         options={[
-          { value: 'soul', role: 'section', label: 'Files' },
-          { value: 'soul', label: 'Edit Soul', hint: 'Voice, behavior, and operating preferences', disabled: !ready },
-          { value: 'memory', label: 'Edit Memory', hint: 'Durable owner memory for this agent', disabled: !ready },
-          { value: 'back', role: 'section', label: 'Navigation' },
-          { value: 'back', label: 'Back', hint: 'Return to Identity Hub menu', role: 'utility' },
+          { value: 'soul', label: 'Edit Soul', disabled: !ready },
+          { value: 'memory', label: 'Edit Memory', disabled: !ready },
+          { value: 'back', label: 'Back', role: 'utility' },
         ]}
         hintLayout="inline"
           onSubmit={choice => {
@@ -70,8 +68,8 @@ export const PublicProfileScreen: React.FC<CommonProps & {
   onEditProfile: () => void
 }> = ({ identity, config, workingStatus, notice, editorOpened, footer, onEditProfile, onBack }) => {
   return (
-    <Surface title="Public Profile" subtitle={notice ?? 'Manage the public name, description, icon, and Agent Card.'} footer={footer}>
-      <IdentitySummary identity={identity} config={config} workingStatus={workingStatus} hideLocalChanges compact />
+    <Surface title="Public Profile" subtitle={notice ?? 'Name, description, and icon.'} footer={footer}>
+      <IdentitySummary identity={identity} config={config} workingStatus={workingStatus} compact />
       {editorOpened && (
         <Box marginTop={1}>
           <Text color={theme.accentPeriwinkle}>Save with ctrl+s in your editor</Text>
@@ -80,10 +78,8 @@ export const PublicProfileScreen: React.FC<CommonProps & {
       <Box marginTop={1}>
         <Select<PublicAction>
           options={[
-            { value: 'edit', role: 'section', label: 'Profile' },
-            { value: 'edit', label: 'Edit Profile', hint: 'Name, description, icon' },
-            { value: 'back', role: 'section', label: 'Navigation' },
-            { value: 'back', label: 'Back', hint: 'Return to Identity Hub menu', role: 'utility' },
+            { value: 'edit', label: 'Edit Profile' },
+            { value: 'back', label: 'Back', role: 'utility' },
           ]}
           hintLayout="inline"
           onSubmit={choice => {
@@ -96,9 +92,3 @@ export const PublicProfileScreen: React.FC<CommonProps & {
     </Surface>
   )
 }
-
-function privateSubtitle(ready: boolean): string {
-  return ready
-    ? 'Edit the durable persona and memory files for this identity.'
-    : 'Use "Refetch Latest Snapshot" from the Identity Hub menu to recover files.'
-}

package/src/identity/{hub → manager}/continuity/RebackupStorageScreen.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { PinataJwtInput } from '../shared/components/PinataJwtInput.js'
-import type { Step } from '../identityHubReducer.js'
+import type { Step } from '../reducer.js'
 
 interface RebackupStorageScreenProps {
   step: Extract<Step, { kind: 'rebackup-storage' | 'public-profile-storage' }>
@@ -18,8 +18,8 @@ export const RebackupStorageScreen: React.FC<RebackupStorageScreenProps> = ({ st
       inputKey="rebackup-storage"
       title={title}
       subtitle={step.error ?? subtitle ?? (publicOnly
-        ? 'Save a Pinata JWT so ethagent can pin the public profile to IPFS.'
-        : 'Save a Pinata JWT so ethagent can pin encrypted state to IPFS.')}
+        ? 'Save a Pinata JWT to pin the public profile to IPFS.'
+        : 'Save a Pinata JWT to pin encrypted state to IPFS.')}
       footer={footer}
       onSubmit={onSubmit}
       onCancel={onCancel}

package/src/identity/manager/continuity/RecoveryConfirmScreen.tsx

@@ -0,0 +1,102 @@
+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 { localChangeStatusView, type LocalChangeStatusView } from './state.js'
+
+import type { ContinuityWorkingTreeStatus } from '../../continuity/storage.js'
+
+type RecoveryConfirmMode = 'publish' | 'refetch' | 'restore'
+
+interface RecoveryConfirmScreenProps {
+  mode: RecoveryConfirmMode
+  workingStatus?: ContinuityWorkingTreeStatus | null
+  pendingPublish?: boolean
+  footer: React.ReactNode
+  onConfirm: () => void
+  onBack: () => void
+}
+
+export const RecoveryConfirmScreen: React.FC<RecoveryConfirmScreenProps> = ({ mode, workingStatus, pendingPublish, footer, onConfirm, onBack }) => {
+  const isPublish = mode === 'publish'
+  const isRestore = mode === 'restore'
+  const title = isPublish
+    ? 'Save Snapshot?'
+    : isRestore
+      ? 'Overwrite Local Changes?'
+      : 'Refetch Latest From Onchain?'
+  const subtitle = isPublish
+    ? 'Saves SOUL.md, MEMORY.md, skills, and profile changes.'
+    : isRestore
+      ? 'This restore targets the active agent and overwrites local continuity files.'
+      : 'This overwrites local files with the onchain version.'
+
+  const localChangeStatus = localChangeStatusView(workingStatus)
+  const body = isPublish
+    ? <SaveSnapshotStatusLine status={localChangeStatus} />
+    : localChangeStatus.hasLocalChanges
+      ? <OverwriteStatusLine status={localChangeStatus} pendingPublish={pendingPublish} />
+      : pendingPublish
+        ? <Text color={theme.accentError} bold>Local snapshot is ahead of onchain; unsaved edits are discarded.</Text>
+        : null
+  const confirmLabel = isPublish
+    ? 'Save Snapshot Now'
+    : localChangeStatus.hasLocalChanges
+      ? 'Overwrite Local Changes'
+      : isRestore
+        ? 'Restore'
+        : 'Refetch'
+
+  return (
+    <Surface title={title} subtitle={subtitle} footer={footer} tone="primary">
+      {body ? <Box flexDirection="column">{body}</Box> : null}
+      <Box marginTop={1}>
+        <Select<'confirm' | 'back'>
+          options={[
+            { value: 'confirm', label: confirmLabel },
+            { value: 'back', label: 'Back', role: 'utility' },
+          ]}
+          hintLayout="inline"
+          onSubmit={choice => {
+            if (choice === 'confirm') return onConfirm()
+            return onBack()
+          }}
+          onCancel={onBack}
+        />
+      </Box>
+    </Surface>
+  )
+}
+
+const OverwriteStatusLine: React.FC<{ status: LocalChangeStatusView; pendingPublish?: boolean }> = ({ status, pendingPublish }) => (
+  <Box flexDirection="column">
+    <Text>
+      <Text color={theme.textSubtle}>Unsaved local changes detected: </Text>
+      <Text color={theme.accentError} bold>{status.files.length > 0 ? status.files.join(', ') : 'local files differ from saved snapshot'}</Text>
+    </Text>
+    <Text color={theme.accentError}>
+      Continuing replaces those files with the restored snapshot.
+    </Text>
+    {pendingPublish ? (
+      <Text color={theme.accentError}>Local snapshot is also ahead of onchain.</Text>
+    ) : null}
+  </Box>
+)
+
+const SaveSnapshotStatusLine: React.FC<{ status: LocalChangeStatusView }> = ({ status }) => {
+  if (status.hasLocalChanges) {
+    return (
+      <Text>
+        <Text color={theme.textSubtle}>Local changes detected: </Text>
+        <Text color={theme.accentError} bold>{status.files.length > 0 ? status.files.join(', ') : 'local files differ from saved snapshot'}</Text>
+      </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>
+}

package/src/identity/{hub → manager}/continuity/SavePromptScreen.tsx

@@ -21,7 +21,6 @@ export const SavePromptScreen: React.FC<SavePromptScreenProps> = ({ workingStatu
   return (
     <Surface
       title="Save your identity changes?"
-      subtitle="Unsaved local edits since the last snapshot."
       footer={footer}
       tone="primary"
     >
@@ -35,8 +34,8 @@ export const SavePromptScreen: React.FC<SavePromptScreenProps> = ({ workingStatu
       <Box marginTop={1}>
         <Select<SavePromptAction>
           options={[
-            { value: 'save-now', label: 'Save now', hint: 'Sign once and save the encrypted snapshot' },
-            { value: 'later', label: 'Not now', hint: 'Ask again on the next launch', role: 'utility' },
+            { value: 'save-now', label: 'Save now', hint: 'Sign and save snapshot' },
+            { value: 'later', label: 'Not now', hint: 'Ask again next launch', role: 'utility' },
           ]}
           hintLayout="inline"
           onSubmit={onSelect}

package/src/identity/{hub → manager}/continuity/completion.ts

@@ -1,6 +1,6 @@
 import type { EthagentIdentity } from '../../../storage/config.js'
 import type { WalletPurpose } from '../../wallet/browserWallet.js'
-import type { ProfileUpdates } from '../identityHubReducer.js'
+import type { ProfileUpdates } from '../reducer.js'
 import { snapshotSaveWalletRole } from './snapshot.js'
 
 export function rebackupWalletPurpose(

package/src/identity/{hub → manager}/continuity/effects.ts

@@ -40,7 +40,7 @@ import {
   encodeRotateAgentURI,
   isAgentInVault,
 } from '../../registry/vault.js'
-import type { Step, ProfileUpdates } from '../identityHubReducer.js'
+import type { Step, ProfileUpdates } from '../reducer.js'
 import { acquireTxGuard, releaseTxGuard } from '../shared/txGuard.js'
 import type { EffectCallbacks } from '../shared/effects/types.js'
 import { awaitConfirmedReceipt } from '../shared/effects/receipts.js'

package/src/identity/{hub → manager}/continuity/skills/DeleteSkillConfirmScreen.tsx

@@ -78,8 +78,8 @@ export const DeleteSkillConfirmScreen: React.FC<DeleteSkillConfirmScreenProps> =
       <Box marginTop={1}>
         <Select<ConfirmChoice>
           options={[
-            { value: 'delete', label: 'Yes, delete', hint: skillMissing ? 'Skill already missing on disk' : 'Permanent. Will be reflected in the next snapshot.', bold: true, disabled: skillMissing },
-            { value: 'cancel', label: 'No, back', hint: 'Return to the delete picker', role: 'utility' },
+            { value: 'delete', label: 'Yes, delete', hint: skillMissing ? 'Already missing on disk' : 'Permanent on next snapshot', bold: true, disabled: skillMissing },
+            { value: 'cancel', label: 'No, back', role: 'utility' },
           ]}
           hintLayout="inline"
           initialIndex={1}

package/src/identity/{hub → manager}/continuity/skills/NewSkillScreen.tsx

@@ -33,11 +33,6 @@ export const NewSkillScreen: React.FC<NewSkillScreenProps> = ({
         }}
         onCancel={onCancel}
       />
-      <Box marginTop={1}>
-        <Text color={theme.dim}>
-          Saved as skills/&lt;folder&gt;/SKILL.md. Add supporting files later by dropping them into the same folder.
-        </Text>
-      </Box>
       {error && (
         <Box marginTop={1}>
           <Text color={theme.accentError}>{error}</Text>

package/src/identity/{hub → manager}/continuity/skills/NewSkillVisibilityScreen.tsx

@@ -22,7 +22,7 @@ export const NewSkillVisibilityScreen: React.FC<NewSkillVisibilityScreenProps> =
 }) => (
   <Surface
     title={`Visibility · ${name}`}
-    subtitle="Public is the default. You can change it later from Change Visibility."
+    subtitle="Public is the default."
     footer={footer}
   >
     {error && (
@@ -33,10 +33,10 @@ export const NewSkillVisibilityScreen: React.FC<NewSkillVisibilityScreenProps> =
     <Box marginTop={1}>
       <Select<SkillVisibility | 'back'>
         options={[
-          { value: 'private', label: 'Private', hint: 'Local-only. Not in the Agent Card.' },
-          { value: 'public', label: 'Public', hint: 'Default. Listed in the Agent Card.' },
+          { value: 'private', label: 'Private', hint: 'Not in the Agent Card' },
+          { value: 'public', label: 'Public', hint: 'Listed in the Agent Card' },
           { value: 'back', role: 'section', label: 'Navigation' },
-          { value: 'back', label: 'Back', hint: 'Return to the name step', role: 'utility' },
+          { value: 'back', label: 'Back', role: 'utility' },
         ]}
         hintLayout="inline"
         initialIndex={1}

package/src/identity/{hub → manager}/continuity/skills/SkillActionsScreen.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { Box, Text } from 'ink'
+import { Box } from 'ink'
 import { Surface } from '../../../../ui/Surface.js'
 import { Select, type SelectOption } from '../../../../ui/Select.js'
 import { theme } from '../../../../ui/theme.js'
@@ -60,48 +60,32 @@ export const SkillActionsScreen: React.FC<SkillActionsScreenProps> = ({
 
   const displayName = entry?.displayName ?? entry?.name ?? skillName
   const visibility = entry?.visibility
-  const subtitle = notice ?? 'Open, change visibility, or delete this skill.'
+  const subtitle = notice ?? formatLeafMeta(visibility, supportingCount)
 
   const options: Array<SelectOption<SkillAction>> = []
   const noop: SkillAction = { kind: 'noop' }
 
-  options.push({ value: noop, role: 'section', label: 'Open' })
   options.push({
     value: { kind: 'open' },
     label: 'Open SKILL.md',
-    hint: 'View or edit this skill',
   })
 
   options.push({ value: noop, role: 'section', label: 'Visibility' })
   options.push(visibilityOption('private', visibility))
   options.push(visibilityOption('public', visibility))
 
-  options.push({ value: noop, role: 'section', label: 'Manage' })
   options.push({
     value: { kind: 'delete' },
     label: 'Delete',
-    hint: 'Remove this skill folder and its supporting files',
   })
-  options.push({ value: noop, role: 'section', label: 'Return' })
   options.push({
     value: { kind: 'back' },
     label: 'Back',
-    hint: 'Return to Skills',
     role: 'utility',
   })
 
-  const leafMeta = formatLeafMeta(visibility, supportingCount)
-
   return (
-    <Surface title={`Skill · ${displayName}`} subtitle={subtitle} footer={footer}>
-      <Box flexDirection="column" marginTop={1}>
-        <Text color={theme.dim}>skills/</Text>
-        <Text>
-          <Text color={theme.dim}>└── </Text>
-          <Text color={theme.accentPeriwinkle} bold>{`${skillName}/SKILL.md`}</Text>
-          {leafMeta ? <Text color={theme.dim}>{`   ${leafMeta}`}</Text> : null}
-        </Text>
-      </Box>
+    <Surface title={displayName} subtitle={subtitle || undefined} footer={footer}>
       <Box marginTop={1}>
         <Select<SkillAction>
           options={options}
@@ -129,7 +113,7 @@ function formatLeafMeta(visibility: SkillVisibility | undefined, supportingCount
 
 function visibilityOption(level: SkillVisibility, current?: SkillVisibility): SelectOption<SkillAction> {
   const isCurrent = current === level
-  const hint = visibilityHint(level) + (isCurrent ? '  ·  current' : '')
+  const hint = visibilityHint(level)
   const base: SelectOption<SkillAction> = {
     value: { kind: 'set-visibility', visibility: level },
     label: `Set ${capitalize(level)}`,
@@ -140,8 +124,8 @@ function visibilityOption(level: SkillVisibility, current?: SkillVisibility): Se
 }
 
 function visibilityHint(level: SkillVisibility): string {
-  if (level === 'private') return 'Local-only. Not in the Agent Card.'
-  return 'Default. Listed in the Agent Card.'
+  if (level === 'private') return 'Not in the Agent Card'
+  return 'Listed in the Agent Card'
 }
 
 function capitalize(value: string): string {

package/src/identity/{hub → manager}/continuity/skills/SkillsTreeScreen.tsx

@@ -73,7 +73,7 @@ export const SkillsTreeScreen: React.FC<SkillsTreeScreenProps> = ({
     }
   }, [identity, editorOpened])
 
-  const subtitle = notice ?? 'Select a skill to open, change visibility, or delete.'
+  const subtitle = notice ?? 'Public and private skills.'
   const isLoading = tree === null
   const skills = tree?.skills ?? []
   const supportingCounts = tree?.supportingCounts ?? {}
@@ -129,47 +129,35 @@ function buildOptions(
       indent: 0,
     })
   } else if (!hasAny) {
-    rows.push({ value: noopValue, role: 'section', label: 'Catalog' })
-    rows.push({ value: noopValue, role: 'notice', label: 'skills/', labelColor: theme.dim, indent: 3 })
-    rows.push({ value: noopValue, role: 'notice', label: '└── <skill>/', labelColor: theme.dim, indent: 3 })
-    rows.push({ value: noopValue, role: 'notice', label: '    └── SKILL.md', labelColor: theme.dim, indent: 3 })
+    rows.push({ value: noopValue, role: 'notice', label: 'No skills yet.', labelColor: theme.dim })
   } else {
     rows.push({ value: noopValue, role: 'section', label: 'Catalog' })
-    rows.push({ value: noopValue, role: 'notice', label: 'skills/', labelColor: theme.dim, indent: 3 })
     const sorted = [...entries].sort((a, b) => a.name.localeCompare(b.name))
-    for (let i = 0; i < sorted.length; i++) {
-      const skill = sorted[i]
+    for (const skill of sorted) {
       if (!skill) continue
-      const isLast = i === sorted.length - 1
-      const branch = isLast ? '└── ' : '├── '
       const supportCount = supportingCounts[skill.name] ?? 0
       const meta = [capitalize(skill.visibility)]
       if (supportCount > 0) meta.push(`${supportCount + 1} files`)
-      meta.push('enter for actions')
       rows.push({
         value: { kind: 'skill', relativePath: skill.relativePath },
-        label: `${branch}${skill.name}/SKILL.md`,
+        label: skill.name,
         hint: meta.join('  ·  '),
-        indent: 3,
       })
     }
+    rows.push({ value: noopValue, role: 'section', label: '' })
   }
 
-  rows.push({ value: noopValue, role: 'section', label: 'Manage' })
   rows.push({
     value: { kind: 'new' },
     label: 'New Skill',
-    hint: 'Scaffold a new skill folder with SKILL.md',
   })
   rows.push({
     value: { kind: 'open-folder' },
     label: 'Open Skills Folder',
-    hint: 'Reveal skills/ in your file manager',
   })
   rows.push({
     value: { kind: 'back' },
     label: 'Back',
-    hint: 'Return to Identity Hub menu',
     role: 'utility',
   })
 

package/src/identity/{hub → manager}/continuity/snapshot.ts

@@ -1,6 +1,6 @@
 import { getAddress, isAddress, type Address } from 'viem'
 import type { EthagentIdentity } from '../../../storage/config.js'
-import type { ProfileUpdates } from '../identityHubReducer.js'
+import type { ProfileUpdates } from '../reducer.js'
 import {
   createWalletContinuitySnapshotEnvelope,
   createWalletRestoreAccessKey,

package/src/identity/{hub → manager}/continuity/vault.ts

@@ -32,7 +32,7 @@ import {
   requestBrowserWalletSignatureAndTransaction,
   type WalletPurpose,
 } from '../../wallet/browserWallet.js'
-import type { Step } from '../identityHubReducer.js'
+import type { Step } from '../reducer.js'
 import type { EffectCallbacks } from '../shared/effects/types.js'
 import { awaitConfirmedReceipt } from '../shared/effects/receipts.js'
 import {

package/src/identity/{hub → manager}/create/CreateFlow.tsx

@@ -3,11 +3,12 @@ import { Box, Text } from 'ink'
 import { Surface } from '../../../ui/Surface.js'
 import { Select } from '../../../ui/Select.js'
 import { TextInput } from '../../../ui/TextInput.js'
+import { TextArea } from '../../../ui/TextArea.js'
 import { theme } from '../../../ui/theme.js'
 import { normalizeErc8004RegistryConfig } from '../../registry/erc8004.js'
 import { networkLabel } from '../shared/model/network.js'
-import type { Step } from '../identityHubReducer.js'
-import { createStepNumber, CREATE_STEP_LABELS } from '../identityHubReducer.js'
+import type { Step } from '../reducer.js'
+import { createStepNumber, CREATE_STEP_LABELS } from '../reducer.js'
 import { WalletApprovalScreen } from '../shared/components/WalletApprovalScreen.js'
 import { BusyScreen } from '../shared/components/BusyScreen.js'
 import { FlowTimeline } from '../shared/components/FlowTimeline.js'
@@ -21,6 +22,7 @@ type CreateFlowProps = {
       | 'create-name'
       | 'create-description'
       | 'create-custody'
+      | 'create-import'
       | 'create-preflight'
       | 'create-registry'
       | 'create-signing'
@@ -57,20 +59,10 @@ export const CreateFlow: React.FC<CreateFlowProps> = ({
   if (step.kind === 'replace-confirm') {
     return (
       <Surface title="Create a New Agent?" footer="enter selects · esc back">
-        <Box flexDirection="column" marginBottom={1}>
-          <Text color={theme.dim}>
-            Your current agent stays in your wallet and remains loadable.
-          </Text>
-          <Text color={theme.dim}>
-            This mints a new agent to this wallet and uses it on this machine.
-          </Text>
-        </Box>
         <Select<'replace' | 'back'>
           options={[
-            { value: 'back', role: 'section', label: 'Current Identity' },
-            { value: 'back', label: 'Keep Current Agent', hint: 'Return without minting anything', role: 'utility' },
-            { value: 'replace', role: 'section', label: 'New Identity' },
-            { value: 'replace', label: 'Mint and Use New Agent', hint: 'Create separate token and make it active' },
+            { value: 'back', label: 'Keep Current Agent', role: 'utility' },
+            { value: 'replace', label: 'Mint and Use New Agent' },
           ]}
           hintLayout="inline"
           onSubmit={choice => {
@@ -101,14 +93,11 @@ export const CreateFlow: React.FC<CreateFlowProps> = ({
 
   if (step.kind === 'create-description') {
     return (
-      <Surface title="Describe Your Agent" subtitle={indicator} footer="enter next · shift+enter newline · esc back">
-        <Text color={theme.dim}>Optional. One short sentence is enough.</Text>
-        <TextInput
+      <Surface title="Describe Your Agent" subtitle={indicator}>
+        <TextArea
           key="agent-description"
           initialValue={step.description ?? ''}
-          placeholder="description"
-          allowEmpty
-          multiline
+          placeholder="optional description"
           onSubmit={description => onDescriptionSubmit(step.name, description.trim())}
           onCancel={onBack}
         />
@@ -119,16 +108,10 @@ export const CreateFlow: React.FC<CreateFlowProps> = ({
   if (step.kind === 'create-custody') {
     return (
       <Surface title="Pick Custody Mode" subtitle={indicator} footer="enter continues · esc back">
-        <Box flexDirection="column" marginBottom={1}>
-          <Text color={theme.dim}>Custody decides who controls the ERC-8004 token and who can rotate the URI pointer.</Text>
-          <Text color={theme.dim}>You can switch later from Identity Hub.</Text>
-        </Box>
         <Select<'simple' | 'advanced'>
           options={[
-            { value: 'simple', role: 'section', label: 'Simple (Recommended)' },
-            { value: 'simple', label: 'Simple', hint: 'One wallet owns the token, signs every save, and rotates the URI directly' },
-            { value: 'advanced', role: 'section', label: 'Advanced' },
-            { value: 'advanced', label: 'Advanced', hint: 'Vault holds the token; owner wallet controls vault, operator wallets get URI-rotation permission' },
+            { value: 'simple', label: 'Simple (recommended)', hint: 'One wallet signs' },
+            { value: 'advanced', label: 'Advanced', hint: 'Operators rotate URI' },
           ]}
           hintLayout="inline"
           onSubmit={onCustodySubmit}
@@ -138,12 +121,56 @@ export const CreateFlow: React.FC<CreateFlowProps> = ({
     )
   }
 
+  if (step.kind === 'create-import') {
+    if (!step.candidates) {
+      return (
+        <BusyScreen
+          title="Checking Existing Notes"
+          subtitle={indicator}
+          label="scanning for notes to import..."
+          onCancel={onBack}
+        />
+      )
+    }
+    const candidates = step.candidates
+    const summary = candidates
+      .map(candidate => `${candidate.source} (${candidate.contentLines} lines)`)
+      .join(', ')
+    const toPreflight = (importNotes?: typeof candidates) => onSetStep({
+      kind: 'create-preflight',
+      name: step.name,
+      description: step.description,
+      ...(step.network ? { network: step.network } : {}),
+      custodyMode: step.custodyMode,
+      ...(importNotes && importNotes.length ? { importNotes } : {}),
+    })
+    return (
+      <Surface title="Import Existing Notes?" subtitle={indicator} footer="enter selects · esc back">
+        <Box flexDirection="column">
+          <Text color={theme.textSubtle}>Found local notes not yet captured by any agent: {summary}.</Text>
+          <Text color={theme.textSubtle}>Import folds them into this agent&apos;s MEMORY.md and the first encrypted snapshot.</Text>
+        </Box>
+        <Box marginTop={1}>
+          <Select<'import' | 'skip'>
+            options={[
+              { value: 'import', label: 'Import Into New Agent', hint: 'Adds them to MEMORY.md' },
+              { value: 'skip', label: 'Start Fresh', hint: 'Use blank scaffolding', role: 'utility' },
+            ]}
+            hintLayout="inline"
+            onSubmit={choice => toPreflight(choice === 'import' ? candidates : undefined)}
+            onCancel={onBack}
+          />
+        </Box>
+      </Surface>
+    )
+  }
+
   if (step.kind === 'create-preflight') {
     return (
       <BusyScreen
         title="Getting Ready"
         subtitle={indicator}
-        label="checking IPFS storage and onchain..."
+        label="checking storage..."
         onCancel={onBack}
       />
     )
@@ -182,11 +209,11 @@ export const CreateFlow: React.FC<CreateFlowProps> = ({
         title={isAdvanced ? 'Connect Owner Wallet' : 'Sign in Wallet'}
         subtitle={
           isAdvanced
-            ? 'This wallet will own the agent token and control the Vault. Operator wallets are configured after minting.'
-            : 'One browser flow signs, saves the IPFS backup, and submits the token transaction.'
+            ? 'Owner wallet controls the Vault. Operators configured after minting.'
+            : 'Signs backup and submits mint transaction.'
         }
         walletSession={walletSession}
-        label={isAdvanced ? 'waiting for owner wallet...' : 'waiting for wallet signature...'}
+        label={isAdvanced ? 'waiting for owner wallet to mint...' : 'waiting for wallet to mint...'}
         onCancel={onBack}
       />
     )