ethagent 2.3.0 → 3.0.0

package/src/identity/continuity/skills/types.ts

@@ -0,0 +1,30 @@
+export type SkillVisibility = 'private' | 'public' | 'discoverable'
+
+export type SkillFrontmatter = {
+  name?: string
+  description?: string
+  whenToUse?: string
+  version?: string
+  argumentHint?: string
+  tags?: string[]
+  visibility?: SkillVisibility
+}
+
+export type SkillIndexEntry = {
+  name: string
+  displayName?: string
+  description: string
+  whenToUse?: string
+  version?: string
+  argumentHint?: string
+  tags?: string[]
+  visibility: SkillVisibility
+  relativePath: string
+  absolutePath: string
+}
+
+export type Skill = SkillIndexEntry & {
+  body: string
+}
+
+export type ContinuitySkillsTree = Record<string, string>

package/src/identity/continuity/storage/defaults.ts

@@ -16,9 +16,8 @@ export function continuityAgentSnapshot(identity: EthagentIdentity): ContinuityA
   }
 }
 
-export function defaultContinuityFiles(identity: EthagentIdentity, now = new Date()): ContinuityFiles {
+export function defaultContinuityFiles(identity: EthagentIdentity, _now = new Date()): ContinuityFiles {
   const owner = identity.ownerAddress ?? identity.address
-  const created = now.toISOString().slice(0, 10)
   const identityBlock = renderPrivateIdentityBlock({
     owner,
     token: identity.agentId ? `#${identity.agentId}` : 'pending registration',
@@ -33,40 +32,29 @@ export function defaultContinuityFiles(identity: EthagentIdentity, now = new Dat
       '',
       '## Persona',
       '',
-      '- Describe the private agent persona, voice, and collaboration style.',
-      '- Keep standing behavior that should survive model switches and device restores.',
-      '- Prefer stable guidance over session-specific preferences.',
+      'The standing voice, collaboration style, and behavior this agent keeps across sessions and models.',
       '',
-      '## Operating Principles',
+      '- Voice: <e.g., direct, concise, no filler>',
+      '- Tone: <e.g., warm but professional>',
+      '- Communication style: <e.g., bullet lists for technical work, prose for narrative>',
       '',
-      '- Record durable values, decision preferences, and owner-approved working principles.',
-      '- Keep implementation-specific facts in MEMORY.md unless they define behavior.',
+      '## Principles',
       '',
-      '## Private Instructions',
+      'Owner-approved working principles. Decisions that should be made the same way every time.',
       '',
-      '- Keep owner-specific standing instructions in this file.',
-      '- Do not share this file directly; save it via the Identity Hub encrypted snapshot.',
-      '- Public capabilities belong in skills.json.',
+      '- <principle: e.g., always confirm before destructive operations>',
+      '- <principle: e.g., bias toward editing existing code over creating new files>',
+      '- <principle: e.g., never hide errors, always surface them clearly>',
       '',
       '## Boundaries',
       '',
-      '- Record private behavioral limits and owner-approved constraints here.',
-      '- Do not store seed phrases, private keys, raw wallet signatures, or API keys.',
-      '- Do not place public delegation claims here; keep them in skills.json.',
+      'What this agent must never do, regardless of how it is asked.',
       '',
-      '## Maintenance Rules',
+      '- <boundary: e.g., never bypass authentication or authorization checks>',
+      '- <boundary: e.g., never commit secrets to source control>',
+      '- Never store seed phrases, private keys, raw wallet signatures, or API keys.',
       '',
-      '- Keep the generated Agent Identity block intact; edit owner-authored sections below it.',
-      '- Do not duplicate the mutable public agent name here; it lives in the token URI and Agent Card.',
-      '- Move factual project memory to MEMORY.md when it is not persona or instruction material.',
-      '- Revise or remove stale guidance instead of accumulating contradictions.',
-      '',
-      '## Change Notes',
-      '',
-      '- Add dated notes when the persona or long-lived private guidance changes.',
-      '',
-      `Created: ${created}`,
-    ].join('\n') + '\n',
+    ].join('\n'),
     'MEMORY.md': [
       '# MEMORY.md',
       '',
@@ -74,35 +62,28 @@ export function defaultContinuityFiles(identity: EthagentIdentity, now = new Dat
       '',
       '## Durable User Preferences',
       '',
-      '- Add long-lived owner preferences that should survive across sessions and model switches.',
-      '',
-      '## Project Context',
-      '',
-      '- Add stable project facts, repo conventions, and active workstreams.',
+      'Long-lived owner preferences that survive sessions and model switches. Capture how the user works.',
       '',
-      '## Decisions and Rationale',
+      '- Communication: <e.g., prefers concise summaries over walls of text>',
+      '- Tooling: <e.g., VS Code, zsh, TypeScript over JavaScript>',
+      '- Workflow: <e.g., reviews PRs in the morning, deploys on Fridays>',
       '',
-      '- Record important decisions and why they were made.',
-      '',
-      '## Facts to Revalidate',
+      '## Project Context',
       '',
-      '- Add time-sensitive facts that should be checked before reuse, with dates or source context when available.',
+      'Stable facts about active projects, repos, and conventions. Add dates for time-sensitive notes.',
       '',
-      '## Maintenance Rules',
+      '### <project-name>',
       '',
-      '- Prefer stable facts, preferences, and decisions over chat transcripts.',
-      '- Do not duplicate the mutable public agent name here; it lives in the token URI and Agent Card.',
-      '- Add dates or source context when a note may become stale or environment-specific.',
-      '- Remove or rewrite stale memory instead of accumulating contradictions.',
+      '- Repository: <url or local path>',
+      '- Stack: <languages, frameworks, key libraries>',
+      '- Conventions: <e.g., conventional commits, semver, branch naming>',
+      '- Active workstream: <YYYY-MM-DD what you are focused on>',
       '',
       '## Boundaries',
       '',
-      '- Do not store seed phrases, private keys, raw wallet signatures, or API keys.',
-      '- Do not store secrets unless the user explicitly asks and the risk is clear.',
-      '- Keep public capabilities in skills.json.',
+      'Never store seed phrases, private keys, raw wallet signatures, or API keys.',
       '',
-      `Created: ${created}`,
-    ].join('\n') + '\n',
+    ].join('\n'),
   }
 }
 

package/src/identity/continuity/storage/files.ts

@@ -9,6 +9,7 @@ import type { ContinuityVaultRef } from './types.js'
 export async function ensureContinuityVault(identity: EthagentIdentity): Promise<ContinuityVaultRef> {
   const ref = continuityVaultRef(identity)
   await fs.mkdir(ref.dir, { recursive: true, mode: 0o700 })
+  await fs.mkdir(ref.skillsDir, { recursive: true, mode: 0o700 })
   return ref
 }
 

package/src/identity/continuity/storage/paths.ts

@@ -9,6 +9,7 @@ export function continuityVaultRef(identity: Pick<EthagentIdentity, 'chainId' |
     soulPath: path.join(dir, 'SOUL.md'),
     memoryPath: path.join(dir, 'MEMORY.md'),
     publicSkillsPath: path.join(dir, 'skills.json'),
+    skillsDir: path.join(dir, 'skills'),
   }
 }
 

package/src/identity/continuity/storage/scaffold.ts

@@ -1,6 +1,14 @@
 import { atomicWriteText } from '../../../storage/atomicWrite.js'
 import type { EthagentIdentity } from '../../../storage/config.js'
-import type { ContinuityFiles } from '../envelope.js'
+import type { ContinuityFiles, ContinuitySkillsTree } from '../envelope.js'
+import {
+  loadSkillsTree,
+  materializeSkillsTree,
+} from '../skills/loadSkills.js'
+import {
+  renderPublicSkillsJsonForIdentity,
+  syncPublicSkillsManifest,
+} from '../skills/publicSkillsSync.js'
 import { defaultContinuityFiles, defaultPublicSkillsJson } from './defaults.js'
 import {
   ensureContinuityFiles,
@@ -20,9 +28,10 @@ export async function ensureIdentityMarkdownScaffold(
 ): Promise<IdentityMarkdownScaffold> {
   const privateFiles = await ensureContinuityFiles(identity)
   const publicSkills = await ensurePublicSkillsFile(identity, { fallback: options.publicSkillsFallback })
+  const syncedPublic = await syncPublicSkillsManifest(identity).catch(() => publicSkills)
   return {
     ...privateFiles,
-    'skills.json': publicSkills,
+    'skills.json': syncedPublic,
   }
 }
 
@@ -47,9 +56,8 @@ export async function syncIdentityMarkdownScaffold(identity: EthagentIdentity):
 export async function prepareSyncedIdentityMarkdownScaffold(identity: EthagentIdentity): Promise<IdentityMarkdownScaffold> {
   await ensureIdentityMarkdownScaffold(identity)
   const privateFiles = await readContinuityFiles(identity)
-  const publicSkills = await readPublicSkillsFile(identity)
   const privateDefaults = defaultContinuityFiles(identity)
-  const publicDefault = defaultPublicSkillsJson(identity)
+  const publicDefault = await renderPublicSkillsJsonForIdentity(identity)
   return {
     'SOUL.md': syncGeneratedMarkdown(privateFiles['SOUL.md'], privateDefaults['SOUL.md'], [
       { marker: 'identity' },
@@ -57,34 +65,28 @@ export async function prepareSyncedIdentityMarkdownScaffold(identity: EthagentId
     'MEMORY.md': syncGeneratedMarkdown(privateFiles['MEMORY.md'], privateDefaults['MEMORY.md'], [
       { marker: 'identity' },
     ]),
-    'skills.json': syncSkillsJson(publicSkills, publicDefault),
+    'skills.json': publicDefault,
   }
 }
 
 export async function prepareSyncedPublicSkillsJson(identity: EthagentIdentity): Promise<string> {
   await ensurePublicSkillsFile(identity)
-  const publicSkills = await readPublicSkillsFile(identity)
-  return syncSkillsJson(publicSkills, defaultPublicSkillsJson(identity))
+  return renderPublicSkillsJsonForIdentity(identity)
 }
 
-function syncSkillsJson(existing: string, fresh: string): string {
-  try {
-    const existingParsed = JSON.parse(existing)
-    const freshParsed = JSON.parse(fresh)
-    const merged = {
-      ...existingParsed,
-      ...freshParsed,
-      skills: existingParsed.skills || freshParsed.skills,
-      inputModes: existingParsed.inputModes || freshParsed.inputModes,
-      outputModes: existingParsed.outputModes || freshParsed.outputModes,
-    }
-    if (!Object.hasOwn(freshParsed, 'imageUrl')) delete merged.imageUrl
-    return `${JSON.stringify(merged, null, 2)}\n`
-  } catch {
-    return fresh
-  }
+export async function prepareSyncedSkillsTree(identity: EthagentIdentity): Promise<ContinuitySkillsTree> {
+  await ensureContinuityVault(identity)
+  return loadSkillsTree(identity)
 }
 
+export async function restoreSkillsTree(
+  identity: EthagentIdentity,
+  tree: ContinuitySkillsTree | undefined,
+): Promise<void> {
+  await materializeSkillsTree(identity, tree)
+}
+
+
 export async function ensurePublicSkillsFile(
   identity: EthagentIdentity,
   options: { fallback?: string | (() => Promise<string>) } = {},

package/src/identity/continuity/storage/status.ts

@@ -1,6 +1,8 @@
 import { createHash } from 'node:crypto'
 import type { EthagentIdentity } from '../../../storage/config.js'
-import type { ContinuityFiles } from '../envelope.js'
+import type { ContinuityFiles, ContinuitySkillsTree } from '../envelope.js'
+import { loadSkillsTree } from '../skills/loadSkills.js'
+import { syncPublicSkillsManifest } from '../skills/publicSkillsSync.js'
 import { continuityVaultRef } from './paths.js'
 import { exists, readContinuityFiles, statIfExists } from './files.js'
 import { readPublicSkillsFile } from './scaffold.js'
@@ -52,28 +54,55 @@ export async function localContinuitySnapshotContentHashes(
   identity: EthagentIdentity,
 ): Promise<ContinuitySnapshotContentHashes> {
   const privateFiles = await readContinuityFiles(identity)
+  await syncPublicSkillsManifest(identity).catch(() => undefined)
   const publicSkills = await readPublicSkillsFile(identity)
-  return continuitySnapshotContentHashes(privateFiles, publicSkills)
+  const skills = await loadSkillsTree(identity).catch(() => ({} as ContinuitySkillsTree))
+  return continuitySnapshotContentHashes(privateFiles, publicSkills, skills)
+}
+
+export function continuitySnapshotContentHashesFromSources(args: {
+  privateFiles: ContinuityFiles
+  publicSkills: string
+  skills: ContinuitySkillsTree
+}): ContinuitySnapshotContentHashes {
+  return continuitySnapshotContentHashes(args.privateFiles, args.publicSkills, args.skills)
 }
 
 function continuitySnapshotContentHashes(
   privateFiles: ContinuityFiles,
   publicSkills: string,
+  skills: ContinuitySkillsTree,
 ): ContinuitySnapshotContentHashes {
+  const skillsHash = hashSkillsTree(skills)
   return {
     'SOUL.md': hashContinuitySnapshotContent(privateFiles['SOUL.md']),
     'MEMORY.md': hashContinuitySnapshotContent(privateFiles['MEMORY.md']),
     'skills.json': hashContinuitySnapshotContent(publicSkills),
+    ...(skillsHash ? { 'private-skills': skillsHash } : {}),
+  }
+}
+
+export function hashSkillsTree(tree: ContinuitySkillsTree): string {
+  const keys = Object.keys(tree).sort()
+  if (keys.length === 0) return ''
+  const h = createHash('sha256')
+  for (const key of keys) {
+    h.update(key, 'utf8')
+    h.update('\0')
+    h.update(normalizeSnapshotContent(tree[key] ?? ''), 'utf8')
+    h.update('\0')
   }
+  return h.digest('hex')
 }
 
 function equalContinuitySnapshotHashes(
   a: ContinuitySnapshotContentHashes,
   b: ContinuitySnapshotContentHashes,
 ): boolean {
-  return a['SOUL.md'] === b['SOUL.md']
-    && a['MEMORY.md'] === b['MEMORY.md']
-    && a['skills.json'] === b['skills.json']
+  if (a['SOUL.md'] !== b['SOUL.md']) return false
+  if (a['MEMORY.md'] !== b['MEMORY.md']) return false
+  if (a['skills.json'] !== b['skills.json']) return false
+  return a['private-skills'] === b['private-skills']
 }
 
 function hashContinuitySnapshotContent(value: string): string {

package/src/identity/continuity/storage/types.ts

@@ -8,14 +8,15 @@ export type ContinuityVaultRef = {
   soulPath: string
   memoryPath: string
   publicSkillsPath: string
+  skillsDir: string
 }
 
 export type IdentityMarkdownScaffold = ContinuityFiles & {
   'skills.json': string
 }
 
-export type ContinuitySnapshotFile = PrivateContinuityFile | 'skills.json'
-export type ContinuitySnapshotContentHashes = Record<ContinuitySnapshotFile, string>
+export type ContinuitySnapshotFile = PrivateContinuityFile | 'skills.json' | 'private-skills'
+export type ContinuitySnapshotContentHashes = Partial<Record<ContinuitySnapshotFile, string>> & Record<PrivateContinuityFile | 'skills.json', string>
 export type ContinuityPublishState = 'not-restored' | 'not-published' | 'verify-needed' | 'local-changes' | 'published'
 export type ContinuityWorkingTreeStatus = {
   ready: boolean

package/src/identity/continuity/storage.ts

@@ -19,8 +19,10 @@ export {
   ensureIdentityMarkdownScaffold,
   ensurePublicSkillsFile,
   prepareSyncedIdentityMarkdownScaffold,
+  prepareSyncedSkillsTree,
   prepareSyncedPublicSkillsJson,
   readPublicSkillsFile,
+  restoreSkillsTree,
   syncIdentityMarkdownScaffold,
   writeIdentityMarkdownScaffold,
   writePublicSkillsFile,
@@ -28,5 +30,6 @@ export {
 export {
   continuityVaultStatus,
   continuityWorkingTreeStatus,
+  continuitySnapshotContentHashesFromSources,
   localContinuitySnapshotContentHashes,
 } from './storage/status.js'

package/src/identity/hub/OperationalRoutes.tsx

@@ -17,6 +17,15 @@ import {
   PrivateContinuityScreen,
   PublicProfileScreen,
 } from './continuity/ContinuityDashboardScreen.js'
+import { SkillsTreeScreen } from './continuity/skills/SkillsTreeScreen.js'
+import { NewSkillScreen } from './continuity/skills/NewSkillScreen.js'
+import { NewSkillVisibilityScreen } from './continuity/skills/NewSkillVisibilityScreen.js'
+import { DeleteSkillScreen } from './continuity/skills/DeleteSkillScreen.js'
+import { DeleteSkillConfirmScreen } from './continuity/skills/DeleteSkillConfirmScreen.js'
+import {
+  SkillVisibilityListScreen,
+  SkillVisibilityPickScreen,
+} from './continuity/skills/SkillVisibilityScreen.js'
 import { RecoveryConfirmScreen } from './continuity/RecoveryConfirmScreen.js'
 import { SavePromptScreen } from './continuity/SavePromptScreen.js'
 import { ErrorScreen } from './shared/components/ErrorScreen.js'
@@ -66,7 +75,11 @@ export const IdentityHubOperationalRoutes: React.FC<IdentityHubOperationalRoutes
     openTokenTransferFlow,
     openPublicProfileEdit,
     openContinuityFile,
-    exportLocalBackupZip,
+    openSkillFile,
+    openSkillsFolder,
+    createSkill,
+    deleteSkill,
+    setSkillVisibility,
   } = controller
 
   if (step.kind === 'rebackup-confirm') {
@@ -143,13 +156,102 @@ export const IdentityHubOperationalRoutes: React.FC<IdentityHubOperationalRoutes
         editorOpened={step.editorOpened}
         onOpenSoul={() => { void openContinuityFile('soul') }}
         onOpenMemory={() => { void openContinuityFile('memory') }}
-        onOpenSkills={() => { void openContinuityFile('skills') }}
-        onExportBackup={() => { void exportLocalBackupZip() }}
         onBack={back}
       />
     )
   }
 
+  if (step.kind === 'continuity-skills-tree') {
+    return (
+      <SkillsTreeScreen
+        identity={identity}
+        config={config}
+        workingStatus={workingStatus}
+        notice={step.notice}
+        editorOpened={step.editorOpened}
+        footer={footer}
+        onOpenSkill={relativePath => { void openSkillFile(relativePath) }}
+        onNewSkill={() => setStep({ kind: 'continuity-skill-new' })}
+        onDelete={() => setStep({ kind: 'continuity-skill-delete' })}
+        onVisibility={() => setStep({ kind: 'continuity-skill-visibility' })}
+        onViewPublicManifest={() => { void openContinuityFile('skills') }}
+        onOpenFolder={() => { void openSkillsFolder() }}
+        onBack={back}
+      />
+    )
+  }
+
+  if (step.kind === 'continuity-skill-visibility') {
+    return (
+      <SkillVisibilityListScreen
+        identity={identity}
+        notice={step.notice}
+        footer={footer}
+        onPick={relativePath => setStep({ kind: 'continuity-skill-visibility-pick', relativePath })}
+        onCancel={back}
+      />
+    )
+  }
+
+  if (step.kind === 'continuity-skill-visibility-pick') {
+    return (
+      <SkillVisibilityPickScreen
+        identity={identity}
+        relativePath={step.relativePath}
+        footer={footer}
+        onSelect={visibility => { void setSkillVisibility(step.relativePath, visibility) }}
+        onCancel={back}
+      />
+    )
+  }
+
+  if (step.kind === 'continuity-skill-new') {
+    return (
+      <NewSkillScreen
+        error={step.error}
+        footer={footer}
+        onSubmit={name => setStep({ kind: 'continuity-skill-new-visibility', name })}
+        onCancel={back}
+      />
+    )
+  }
+
+  if (step.kind === 'continuity-skill-new-visibility') {
+    return (
+      <NewSkillVisibilityScreen
+        name={step.name}
+        {...(step.error ? { error: step.error } : {})}
+        footer={footer}
+        onSelect={visibility => { void createSkill(step.name, visibility) }}
+        onCancel={back}
+      />
+    )
+  }
+
+  if (step.kind === 'continuity-skill-delete') {
+    return (
+      <DeleteSkillScreen
+        identity={identity}
+        notice={step.notice}
+        footer={footer}
+        onPick={target => setStep({ kind: 'continuity-skill-delete-confirm', target })}
+        onCancel={back}
+      />
+    )
+  }
+
+  if (step.kind === 'continuity-skill-delete-confirm') {
+    return (
+      <DeleteSkillConfirmScreen
+        identity={identity}
+        target={step.target}
+        footer={footer}
+        onConfirm={() => { void deleteSkill(step.target.relativePath) }}
+        onCancel={back}
+      />
+    )
+  }
+
   if (step.kind === 'continuity-public') {
     return (
       <PublicProfileScreen

package/src/identity/hub/Routes.tsx

@@ -9,11 +9,11 @@ import { copyToClipboard } from '../../utils/clipboard.js'
 import { DEFAULT_IPFS_API_URL } from '../storage/ipfs.js'
 import { chainIdForNetwork, erc8004ConfigForSupportedChain } from '../registry/erc8004.js'
 import { shortAddress } from './shared/model/format.js'
+import { canRestoreCandidate } from './restore/discover.js'
 import {
-  canRestoreCandidate,
   resolveAgentEnsToCandidate,
   resolveAgentTokenIdToCandidate,
-} from './restore/index.js'
+} from './restore/resolve.js'
 import {
   runRegistrySubmit,
   runStorageSubmit,
@@ -85,7 +85,7 @@ export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }>
               { value: 'ens', role: 'section', label: 'Set Up Now' },
               { value: 'ens', label: 'Set Up ENS Name', hint: 'Walks you through Root, Name, Review, and Apply' },
               { value: 'skip', role: 'section', label: 'Skip' },
-              { value: 'skip', label: 'Skip For Now', hint: 'Continue to model setup. ENS can be added from Identity Hub later.', role: 'utility' },
+              { value: 'skip', label: 'Skip For Now', hint: 'Continue to model setup; add ENS later', role: 'utility' },
             ]}
             hintLayout="inline"
             onSubmit={choice => {
@@ -142,6 +142,7 @@ export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }>
           setStep({ kind: 'custody-model', identity, registry: reg, returnTo: { kind: 'menu' } })
         }}
         onContinuity={() => setStep({ kind: 'continuity-private' })}
+        onSkillsTree={() => setStep({ kind: 'continuity-skills-tree' })}
         onIdentityValues={() => setStep({ kind: 'details' })}
         onPrepareTransfer={openTokenTransferFlow}
         onStorage={() => setStep({ kind: 'storage-credential' })}
@@ -329,6 +330,7 @@ export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }>
       <DetailsScreen
         identity={identity}
         config={config}
+        workingStatus={workingStatus}
         copyNotice={copyNotice}
         unlinked={reconciliation?.token === 'unlinked'}
         {...(reconciliation?.onChainOwner ? { onchainOwner: reconciliation.onChainOwner } : {})}

package/src/identity/hub/continuity/ContinuityDashboardScreen.tsx

@@ -10,7 +10,7 @@ import { changedContinuitySnapshotFiles } from './state.js'
 import { readIdentityStateString } from '../custody/state.js'
 import { shortCid } from '../shared/model/format.js'
 
-type PrivateAction = 'soul' | 'memory' | 'skills' | 'export-backup' | 'back'
+type PrivateAction = 'soul' | 'memory' | 'back'
 type PublicAction = 'edit' | 'back'
 
 interface CommonProps {
@@ -36,7 +36,7 @@ const SaveFromHubHint: React.FC<{ workingStatus?: ContinuityWorkingTreeStatus |
         Unsaved changes
         {files.length > 0 ? `: ${files.join(', ')}` : ''}
       </Text>
-      <Text color={theme.dim}>Use Save Snapshot Now in the Identity Hub menu, or relaunch ethagent.</Text>
+      <Text color={theme.dim}>Save Snapshot Now to publish.</Text>
     </Box>
   )
 }
@@ -44,8 +44,6 @@ const SaveFromHubHint: React.FC<{ workingStatus?: ContinuityWorkingTreeStatus |
 export const PrivateContinuityScreen: React.FC<CommonProps & {
   onOpenSoul: () => void
   onOpenMemory: () => void
-  onOpenSkills: () => void
-  onExportBackup: () => void
 }> = ({
   identity,
   config,
@@ -56,13 +54,10 @@ export const PrivateContinuityScreen: React.FC<CommonProps & {
   footer,
   onOpenSoul,
   onOpenMemory,
-  onOpenSkills,
-  onExportBackup,
   onBack,
 }) => (
-  <Surface title="Soul, Memory, and Skills" subtitle={notice ?? privateSubtitle(ready)} footer={footer}>
+  <Surface title="Soul & Memory" subtitle={notice ?? privateSubtitle(ready)} footer={footer}>
     <IdentitySummary identity={identity} config={config} workingStatus={workingStatus} hideLocalChanges />
-    <PrivateRows identity={identity} ready={ready} />
     <SaveFromHubHint workingStatus={workingStatus} />
     {editorOpened && (
       <Box marginTop={1}>
@@ -72,13 +67,9 @@ export const PrivateContinuityScreen: React.FC<CommonProps & {
     <Box marginTop={1}>
       <Select<PrivateAction>
         options={[
-          { value: 'soul', role: 'section', label: 'Private Continuity' },
+          { 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: 'skills', role: 'section', label: 'Public Capabilities' },
-          { value: 'skills', label: 'Edit skills.json', hint: 'Machine-readable capabilities for discovery', disabled: !ready },
-          { value: 'export-backup', role: 'section', label: 'Local Backup' },
-          { value: 'export-backup', label: 'Save Local Backup', hint: 'Bundle SOUL.md, MEMORY.md, skills.json into a zip you can keep anywhere', disabled: !ready },
           { value: 'back', role: 'section', label: 'Navigation' },
           { value: 'back', label: 'Back', hint: 'Return to Identity Hub menu', role: 'utility' },
         ]}
@@ -86,8 +77,6 @@ export const PrivateContinuityScreen: React.FC<CommonProps & {
           onSubmit={choice => {
             if (choice === 'soul') return onOpenSoul()
             if (choice === 'memory') return onOpenMemory()
-            if (choice === 'skills') return onOpenSkills()
-            if (choice === 'export-backup') return onExportBackup()
             return onBack()
           }}
         onCancel={onBack}
@@ -102,7 +91,6 @@ export const PublicProfileScreen: React.FC<CommonProps & {
   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 />
-      <PublicProfileRows identity={identity} />
       <SaveFromHubHint workingStatus={workingStatus} />
       {editorOpened && (
         <Box marginTop={1}>
@@ -129,42 +117,8 @@ export const PublicProfileScreen: React.FC<CommonProps & {
   )
 }
 
-const PrivateRows: React.FC<{ identity?: EthagentIdentity; ready: boolean }> = ({ identity, ready }) => (
-  <Box flexDirection="column" marginTop={1}>
-    <Text>
-      <Text color={theme.dim}>{'Private'.padEnd(13)}</Text>
-      <Text color={ready ? theme.text : theme.dim}>{ready ? 'Local Files Ready' : 'Missing Local Working Files'}</Text>
-    </Text>
-    <Text>
-      <Text color={theme.dim}>{'Snapshot'.padEnd(13)}</Text>
-      <Text color={identity?.backup?.cid ? theme.text : theme.dim}>{identity?.backup?.cid ? shortCid(identity.backup.cid) : 'Not Saved Yet'}</Text>
-    </Text>
-    <Text>
-      <Text color={theme.dim}>{'Skills'.padEnd(13)}</Text>
-      <Text color={identity?.publicSkills?.cid ? theme.text : theme.dim}>{identity?.publicSkills?.cid ? shortCid(identity.publicSkills.cid) : 'Not Saved'}</Text>
-    </Text>
-  </Box>
-)
-
-const PublicProfileRows: React.FC<{ identity?: EthagentIdentity }> = ({ identity }) => (
-  <Box flexDirection="column" marginTop={1}>
-    <Text>
-      <Text color={theme.dim}>{publicProfileLabel('Agent Card')}</Text>
-      <Text color={identity?.publicSkills?.agentCardCid ? theme.text : theme.dim}>{identity?.publicSkills?.agentCardCid ? shortCid(identity.publicSkills.agentCardCid) : 'Not Saved'}</Text>
-    </Text>
-    <Text>
-      <Text color={theme.dim}>{publicProfileLabel('Agent Icon')}</Text>
-      <Text color={readIdentityStateString(identity?.state, 'imageUrl') ? theme.text : theme.dim}>{readIdentityStateString(identity?.state, 'imageUrl') ? 'Attached' : 'Not Attached'}</Text>
-    </Text>
-  </Box>
-)
-
-function publicProfileLabel(label: string): string {
-  return label.padEnd(16)
-}
-
 function privateSubtitle(ready: boolean): string {
   return ready
-    ? 'Edit local continuity files. Public skills are saved with the same snapshot.'
+    ? '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/continuity/RecoveryConfirmScreen.tsx

@@ -66,7 +66,7 @@ export const RecoveryConfirmScreen: React.FC<RecoveryConfirmScreenProps> = ({ mo
               label: isPublish ? 'Yes, Save Snapshot Now' : 'Yes, Refetch From Chain',
               hint: isPublish ? 'Sign and save the encrypted snapshot' : 'Wallet decrypts and overwrites local files',
             },
-            { value: 'back', role: 'section', label: 'Cancel' },
+            { value: 'back', role: 'section', label: 'Navigation' },
             {
               value: 'back',
               label: 'No, Go Back',