ethagent 1.1.1 → 1.1.2

package/README.md

@@ -11,7 +11,7 @@ ethagent requires Node.js 20 or newer. Install it from npm with `npm install -g
 
 ## First Run
 
-First run walks model setup, then identity setup. You can use a local GGUF model through llama.cpp, or connect OpenAI, Anthropic, or Gemini.
+First run walks identity setup, then model setup. You can use a local GGUF model through llama.cpp, or connect OpenAI, Anthropic, or Gemini.
 
 Create a new ERC-8004 agent with a browser wallet, load an agent token you already own, or skip identity setup and add it later from the Identity Hub.
 
@@ -31,6 +31,8 @@ The Identity Hub manages the portable identity. Each identity gets a local conti
 
 **Save Snapshot Now** encrypts the current private continuity, pins the public discovery files, writes registration metadata, and updates the ERC-8004 tokenURI. **Refetch Latest Snapshot** reads the current tokenURI from chain, asks the owner wallet to sign the decrypt challenge, and restores local files from the published state. The current tokenURI is the source of truth.
 
+Agents can also be looked up by token ID on [8004scan](https://8004scan.io/).
+
 ## Models
 
 ethagent works with OpenAI, Anthropic, Gemini, and local GGUF models served through a llama.cpp-compatible endpoint.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethagent",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "A privacy-first AI agent with a portable Ethereum identity",
   "type": "module",
   "main": "bin/ethagent.js",
@@ -23,14 +23,16 @@
   },
   "keywords": [
     "ethereum",
-    "agent",
-    "ai",
-    "privacy-first",
+    "erc-8004",
+    "ai-agent",
+    "cli",
+    "privacy",
     "ipfs",
-    "ERC-8004",
-    "onchain",
-    "offline",
-    "ens"
+    "wallet",
+    "llm",
+    "gguf",
+    "mcp",
+    "identity"
   ],
   "repository": {
     "type": "git",

package/src/app/FirstRun.tsx

@@ -289,6 +289,7 @@ export const FirstRun: React.FC<FirstRunProps> = ({ onComplete, onCancel }) => {
           <TextInput
             isSecret
             placeholder={provider === 'openai' ? 'sk-...' : 'paste key and press enter'}
+            chromeWidth={4}
             validate={v => v.trim().length >= 8 ? null : 'key looks too short'}
             onSubmit={async value => {
               const trimmed = value.trim()
@@ -326,6 +327,7 @@ export const FirstRun: React.FC<FirstRunProps> = ({ onComplete, onCancel }) => {
           <TextInput
             initialValue={defaultModel}
             placeholder={defaultModel}
+            chromeWidth={4}
             onSubmit={model => goTo({
               kind: 'saving',
               config: withFirstRunIdentity({

package/src/chat/ChatScreen.tsx

@@ -143,6 +143,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
   const [mode, setMode] = useState<SessionMode>('chat')
   const [pendingPlan, setPendingPlan] = useState<PendingPlan | null>(null)
   const [compactionUi, setCompactionUi] = useState<CompactionUiState | null>(null)
+  const [canScrollTranscript, setCanScrollTranscript] = useState(false)
   const [sessionId, setSessionId] = useState<string>(() => newSessionId())
   const [sessionKey, setSessionKey] = useState<number>(0)
   const [cwd, setCwd] = useState<string>(() => syncCwdFromProcess())
@@ -1094,6 +1095,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
             : `open failed: ${result.error}`,
           result.ok ? 'dim' : 'error',
         )
+        if (result.ok) setContinuityEditReview(prev => prev ? { ...prev, editorOpened: true } : null)
         return
       }
       setContinuityEditReview(null)
@@ -1398,9 +1400,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
           <Text color={theme.dim}> · </Text>
         </>
       )}
-      <Text color={theme.dim}>
-        {'pgup/pgdn scroll · alt+p model · alt+i identity'}
-      </Text>
+      <Text color={theme.dim}>{chatFooterShortcutText(canScrollTranscript)}</Text>
     </Box>
   )
   const header = <BrandSplash contextLine={contextLine} tipLine={tipLine} updateNotice={updateNotice ?? null} />
@@ -1466,10 +1466,15 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
       )}
       sessionKey={sessionKey}
       onVisibleReasoningIdsChange={updateVisibleReasoningIds}
+      onTranscriptScrollabilityChange={setCanScrollTranscript}
     />
   )
 }
 
+export function chatFooterShortcutText(canScrollTranscript: boolean): string {
+  return `${canScrollTranscript ? 'pgup/pgdn scroll · ' : ''}alt+p model · alt+i identity`
+}
+
 function formatContextLabel(usage: ContextUsage): string {
   if (!Number.isFinite(usage.usedTokens) || usage.usedTokens <= 0) return 'Estimated context: empty'
   return `Estimated context: ${usage.percent}% used`

package/src/chat/ContinuityEditReviewView.tsx

@@ -8,6 +8,7 @@ export type ContinuityEditReviewState = {
   file: 'SOUL.md' | 'MEMORY.md'
   filePath: string
   summary: string
+  editorOpened?: boolean
 }
 
 export type ContinuityEditReviewAction = 'open' | 'save-publish' | 'later'
@@ -28,6 +29,11 @@ export const ContinuityEditReviewView: React.FC<{
         <Text color={theme.textSubtle}>review file</Text>
         <Text color={theme.text}>{review.filePath}</Text>
       </Box>
+      {review.editorOpened && (
+        <Box marginTop={1}>
+          <Text color={theme.accentPeach}>Save with ctrl+s in your editor</Text>
+        </Box>
+      )}
       <Box marginTop={1} flexDirection="column">
         <Text color={theme.textSubtle}>saved locally</Text>
         <Text color={theme.dim}>Previous version saved in identity history. /rewind does not restore identity continuity.</Text>

package/src/chat/ConversationStack.tsx

@@ -12,6 +12,7 @@ type ConversationStackProps = {
   status?: React.ReactNode
   sessionKey: number
   onVisibleReasoningIdsChange?: (ids: string[]) => void
+  onTranscriptScrollabilityChange?: (canScroll: boolean) => void
 }
 
 export const ConversationStack: React.FC<ConversationStackProps> = ({
@@ -23,6 +24,7 @@ export const ConversationStack: React.FC<ConversationStackProps> = ({
   status,
   sessionKey,
   onVisibleReasoningIdsChange,
+  onTranscriptScrollabilityChange,
 }) => {
   return (
     <Box flexDirection="column" padding={1}>
@@ -33,6 +35,7 @@ export const ConversationStack: React.FC<ConversationStackProps> = ({
         active={transcriptActive}
         bottomVariant={bottomVariant}
         onVisibleReasoningIdsChange={onVisibleReasoningIdsChange}
+        onScrollabilityChange={onTranscriptScrollabilityChange}
       />
       <Box marginTop={1} width="100%">
         {bottom}

package/src/chat/TranscriptView.tsx

@@ -21,6 +21,7 @@ type TranscriptViewProps = {
   active?: boolean
   bottomVariant?: 'prompt' | 'overlay'
   onVisibleReasoningIdsChange?: (ids: string[]) => void
+  onScrollabilityChange?: (canScroll: boolean) => void
 }
 
 const PROMPT_RESERVED_LINES = 11
@@ -33,6 +34,7 @@ export const TranscriptView: React.FC<TranscriptViewProps> = ({
   active = true,
   bottomVariant = 'prompt',
   onVisibleReasoningIdsChange,
+  onScrollabilityChange,
 }) => {
   const { stdout } = useStdout()
   const columns = stdout.columns ?? process.stdout.columns ?? 80
@@ -89,6 +91,10 @@ export const TranscriptView: React.FC<TranscriptViewProps> = ({
     onVisibleReasoningIdsChange?.(visibleReasoningIds)
   }, [onVisibleReasoningIdsChange, visibleReasoningIds])
 
+  useEffect(() => {
+    onScrollabilityChange?.(metrics.maxScrollTop > 0)
+  }, [metrics.maxScrollTop, onScrollabilityChange])
+
   useAppInput((_input, key) => {
     if (key.pageUp) {
       const target = promptScrollTopForPageUp(

package/src/cli/updateNotice.ts

@@ -24,7 +24,7 @@ export function isNewerVersion(candidate: string, current: string): boolean {
 
 export function formatUpdateNotice(currentVersion: string, latestVersion: string): string | null {
   if (!isNewerVersion(latestVersion, currentVersion)) return null
-  return `update available: ethagent ${currentVersion} -> ${latestVersion}; run npm i -g ethagent`
+  return `✨ update available: ethagent ${currentVersion} -> ${latestVersion} · run npm i -g ethagent@latest`
 }
 
 export async function checkForUpdates(

package/src/identity/hub/IdentityHub.tsx

@@ -381,8 +381,8 @@ export const IdentityHub: React.FC<IdentityHubProps> = ({ mode, config, initialA
         ? `opened ${kind === 'soul' ? 'SOUL.md' : kind === 'memory' ? 'MEMORY.md' : 'skills.json'} with ${result.method}.`
         : `open failed: ${result.error}`
       setStep(kind === 'skills'
-        ? { kind: 'continuity-public', notice: message }
-        : { kind: 'continuity-private', notice: message })
+        ? { kind: 'continuity-public', notice: message, editorOpened: result.ok }
+        : { kind: 'continuity-private', notice: message, editorOpened: result.ok })
     } catch (err: unknown) {
       errorStep(err, kind === 'skills' ? { kind: 'continuity-public' } : { kind: 'continuity-private' })
     }
@@ -609,6 +609,7 @@ export const IdentityHub: React.FC<IdentityHubProps> = ({ mode, config, initialA
         ready={continuityReady}
         notice={step.notice}
         footer={footer}
+        editorOpened={step.editorOpened}
         onOpenSoul={() => { void openContinuityFile('soul') }}
         onOpenMemory={() => { void openContinuityFile('memory') }}
         onBack={back}
@@ -625,6 +626,7 @@ export const IdentityHub: React.FC<IdentityHubProps> = ({ mode, config, initialA
         ready={continuityReady}
         notice={step.notice}
         footer={footer}
+        editorOpened={step.editorOpened}
         onEditProfile={() => openPublicProfileEdit({ kind: 'continuity-public' })}
         onOpenSkills={() => { void openContinuityFile('skills') }}
         onBack={back}

package/src/identity/hub/identityHubModel.ts

@@ -6,6 +6,7 @@ import {
 } from '../registry/erc8004.js'
 import { AgentStateOwnerMismatchError } from '../crypto/backupEnvelope.js'
 import { ContinuitySnapshotOwnerMismatchError } from '../continuity/envelope.js'
+import type { ContinuityWorkingTreeStatus } from '../continuity/storage.js'
 import { resolveSelectedNetwork } from '../registry/registryConfig.js'
 
 export const PREFLIGHT_AGENT_URI = 'ipfs://bafybeigdyrztma2dbfczw7q6ooozbxlqzyw5r7w4f3qw2axvvxqg3w6y7q'
@@ -214,6 +215,85 @@ export function identitySummaryRows(
   ]
 }
 
+export type LocalChangeStatusView = {
+  label: string
+  detail: string
+  tone: 'ok' | 'warn' | 'dim'
+  files: string[]
+  hasLocalChanges: boolean
+}
+
+export function changedContinuitySnapshotFiles(
+  workingStatus?: ContinuityWorkingTreeStatus | null,
+): string[] {
+  if (!workingStatus?.localContentHashes || !workingStatus.publishedContentHashes) return []
+  const files: Array<keyof typeof workingStatus.localContentHashes> = ['SOUL.md', 'MEMORY.md', 'skills.json']
+  return files.filter(file => workingStatus.localContentHashes?.[file] !== workingStatus.publishedContentHashes?.[file])
+}
+
+export function localChangeStatusView(
+  workingStatus?: ContinuityWorkingTreeStatus | null,
+): LocalChangeStatusView {
+  if (!workingStatus) {
+    return {
+      label: 'Local Changes',
+      detail: 'Checking status...',
+      tone: 'dim',
+      files: [],
+      hasLocalChanges: false,
+    }
+  }
+
+  if (workingStatus.publishState === 'published') {
+    return {
+      label: 'Local Changes',
+      detail: 'None detected',
+      tone: 'ok',
+      files: [],
+      hasLocalChanges: false,
+    }
+  }
+
+  if (workingStatus.publishState === 'local-changes') {
+    const files = changedContinuitySnapshotFiles(workingStatus)
+    return {
+      label: 'Local Changes',
+      detail: files.length > 0 ? `Detected: ${files.join(', ')}` : 'Detected: local files differ from saved snapshot',
+      tone: 'warn',
+      files,
+      hasLocalChanges: true,
+    }
+  }
+
+  if (workingStatus.publishState === 'not-published') {
+    return {
+      label: 'Local Changes',
+      detail: 'Snapshot not saved yet',
+      tone: 'warn',
+      files: [],
+      hasLocalChanges: false,
+    }
+  }
+
+  if (workingStatus.publishState === 'verify-needed') {
+    return {
+      label: 'Local Changes',
+      detail: 'Unable to verify saved snapshot',
+      tone: 'warn',
+      files: [],
+      hasLocalChanges: false,
+    }
+  }
+
+  return {
+    label: 'Local Changes',
+    detail: 'Local files not restored',
+    tone: 'warn',
+    files: [],
+    hasLocalChanges: false,
+  }
+}
+
 export type IdentityDetailSection = {
   title: string
   rows: Array<{

package/src/identity/hub/identityHubReducer.ts

@@ -31,8 +31,8 @@ export type Step =
   | { kind: 'restore-authorizing'; cid: string; apiUrl: string; envelope: RestorableBackupEnvelope; candidate: Erc8004AgentCandidate; purpose?: RestorePurpose }
   | { kind: 'rebackup-signing'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; pinataJwt?: string; profileUpdates?: ProfileUpdates; returnTo?: Step }
   | { kind: 'rebackup-storage'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; error?: string; pinataJwt?: string; profileUpdates?: ProfileUpdates; returnTo?: Step }
-  | { kind: 'continuity-private'; notice?: string }
-  | { kind: 'continuity-public'; notice?: string }
+  | { kind: 'continuity-private'; notice?: string; editorOpened?: boolean }
+  | { kind: 'continuity-public'; notice?: string; editorOpened?: boolean }
   | { kind: 'rebackup-confirm'; back: Step }
   | { kind: 'recovery-refetch-confirm'; back: Step }
   | { kind: 'recovery-refetching'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; back: Step }

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

@@ -17,6 +17,7 @@ type CommonProps = {
   workingStatus?: ContinuityWorkingTreeStatus | null
   ready: boolean
   notice?: string
+  editorOpened?: boolean
   footer: React.ReactNode
   onBack: () => void
 }
@@ -42,6 +43,7 @@ export const PrivateContinuityScreen: React.FC<CommonProps & {
   workingStatus,
   ready,
   notice,
+  editorOpened,
   footer,
   onOpenSoul,
   onOpenMemory,
@@ -51,6 +53,11 @@ export const PrivateContinuityScreen: React.FC<CommonProps & {
     <IdentitySummary identity={identity} config={config} workingStatus={workingStatus} compact />
     <PrivateRows identity={identity} ready={ready} />
     <SaveFromHubHint workingStatus={workingStatus} />
+    {editorOpened && (
+      <Box marginTop={1}>
+        <Text color={theme.accentPeach}>Save with ctrl+s in your editor</Text>
+      </Box>
+    )}
     <Box marginTop={1}>
       <Select<PrivateAction>
         options={[
@@ -75,11 +82,16 @@ export const PrivateContinuityScreen: React.FC<CommonProps & {
 export const PublicSkillsScreen: React.FC<CommonProps & {
   onEditProfile: () => void
   onOpenSkills: () => void
-}> = ({ identity, config, workingStatus, notice, footer, onEditProfile, onOpenSkills, onBack }) => (
+}> = ({ identity, config, workingStatus, notice, editorOpened, footer, onEditProfile, onOpenSkills, onBack }) => (
   <Surface title="Public Profile" subtitle={notice ?? 'Manage public metadata, skills.json, and the agent card.'} footer={footer}>
     <IdentitySummary identity={identity} config={config} workingStatus={workingStatus} compact />
     <PublicProfileRows identity={identity} />
     <SaveFromHubHint workingStatus={workingStatus} />
+    {editorOpened && (
+      <Box marginTop={1}>
+        <Text color={theme.accentPeach}>Save with ctrl+s in your editor</Text>
+      </Box>
+    )}
     <Box marginTop={1}>
       <Select<PublicAction>
         options={[

package/src/identity/hub/screens/EditProfileFlow.tsx

@@ -120,6 +120,7 @@ export const EditProfileFlow: React.FC<EditProfileFlowProps> = ({
         initialValue={currentDescription}
         placeholder="description"
         allowEmpty
+        multiline
         onSubmit={value => onDescriptionSubmit(value.trim())}
         onCancel={onBack}
       />

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

@@ -2,10 +2,22 @@ import React from 'react'
 import { Box, Text } from 'ink'
 import { theme } from '../../../ui/theme.js'
 import type { EthagentConfig, EthagentIdentity } from '../../../storage/config.js'
-import { identitySummaryRows, lastBackupLabel } from '../identityHubModel.js'
+import {
+  identitySummaryRows,
+  lastBackupLabel,
+  localChangeStatusView,
+  type LocalChangeStatusView,
+} from '../identityHubModel.js'
 
 import type { ContinuityWorkingTreeStatus } from '../../continuity/storage.js'
 
+type SummaryRow = {
+  label: string
+  value: string
+  tone: 'ok' | 'dim' | 'warn'
+  highlight?: boolean
+}
+
 export const IdentitySummary: React.FC<{
   identity?: EthagentIdentity
   config?: EthagentConfig
@@ -25,24 +37,10 @@ export const IdentitySummary: React.FC<{
     : ''
 
   const row = (label: string) => rows.find(item => item.label === label)
-  
-  const needsBackup = workingStatus?.publishState === 'local-changes' || workingStatus?.publishState === 'not-published' || workingStatus?.publishState === 'verify-needed'
-  let changedFiles: string[] = []
-  if (needsBackup) {
-    if (workingStatus?.localContentHashes && workingStatus?.publishedContentHashes) {
-      if (workingStatus.localContentHashes['SOUL.md'] !== workingStatus.publishedContentHashes['SOUL.md']) changedFiles.push('SOUL.md')
-      if (workingStatus.localContentHashes['MEMORY.md'] !== workingStatus.publishedContentHashes['MEMORY.md']) changedFiles.push('MEMORY.md')
-      if (workingStatus.localContentHashes['skills.json'] !== workingStatus.publishedContentHashes['skills.json']) changedFiles.push('skills.json')
-    } else {
-      changedFiles = ['SOUL.md', 'MEMORY.md', 'skills.json']
-    }
-  }
+  const localChangeStatus = localChangeStatusView(workingStatus)
+  const lastSavedRow: SummaryRow = { label: 'Last Saved', value: lastBackup, tone: lastBackup === 'never' ? 'dim' : 'ok' }
 
-  const lastSavedRow = needsBackup
-    ? { label: 'Unsaved', value: changedFiles.length > 0 ? changedFiles.join(', ') : 'Markdown files', tone: 'warn' as const, highlight: true }
-    : { label: 'Last Saved', value: lastBackup, tone: lastBackup === 'never' ? 'dim' as const : 'ok' as const }
-
-  const summaryRows = [
+  const summaryRows: SummaryRow[] = [
     { label: 'Token', value: row('token')?.value ?? 'Not Created', tone: row('token')?.tone ?? 'dim', highlight: true },
     { label: 'Network', value: row('network')?.value ?? 'Unknown', tone: row('network')?.tone ?? 'dim' },
     { label: 'Owner', value: row('owner')?.value ?? 'Not Connected', tone: row('owner')?.tone ?? 'dim' },
@@ -57,18 +55,36 @@ export const IdentitySummary: React.FC<{
     <Box flexDirection="column">
       <Text color={theme.accentPrimary} bold>{stateName || 'Active Agent'}</Text>
       {summaryRows.map(row => {
-        const valueColor = row.tone === 'warn' ? 'red' : (row.tone === 'ok' ? theme.text : theme.dim)
+        const valueColor = row.tone === 'warn' ? '#e87070' : (row.tone === 'ok' ? theme.text : theme.dim)
         return (
           <Text key={row.label}>
             <Text color={theme.dim}>{row.label.padEnd(12)}</Text>
-            <Text color={valueColor} bold={row.highlight}>{displayValue(row.value)}</Text>
+            <Text color={valueColor} bold={row.highlight ?? false}>{displayValue(row.value)}</Text>
           </Text>
         )
       })}
+      <Box marginTop={1}>
+        <LocalChangeStatusLine status={localChangeStatus} />
+      </Box>
     </Box>
   )
 }
 
+const LocalChangeStatusLine: React.FC<{ status: LocalChangeStatusView }> = ({ status }) => {
+  if (status.hasLocalChanges) {
+    return (
+      <Text color="#e87070" bold>
+        Local changes detected
+        {status.files.length > 0 ? `: ${status.files.join(', ')}` : ''}
+      </Text>
+    )
+  }
+
+  const color = status.tone === 'ok' ? theme.accentMint : status.tone === 'warn' ? theme.accentPeach : 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

package/src/identity/hub/screens/RecoveryConfirmScreen.tsx

@@ -3,6 +3,7 @@ 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 '../identityHubModel.js'
 
 import type { ContinuityWorkingTreeStatus } from '../../continuity/storage.js'
 
@@ -31,29 +32,21 @@ export const RecoveryConfirmScreen: React.FC<RecoveryConfirmScreenProps> = ({ mo
     ? 'Any local edits to SOUL.md, MEMORY.md, skills.json, and public profile become the saved state. The previous snapshot pointer is overwritten.'
     : 'Unsaved local edits will be lost. Use this when local files are missing or out of sync with the latest saved snapshot.'
 
-  const needsBackup = workingStatus?.publishState === 'local-changes' || workingStatus?.publishState === 'not-published' || workingStatus?.publishState === 'verify-needed'
-  let changedFiles: string[] = []
-  if (isPublish && needsBackup) {
-    if (workingStatus?.localContentHashes && workingStatus?.publishedContentHashes) {
-      if (workingStatus.localContentHashes['SOUL.md'] !== workingStatus.publishedContentHashes['SOUL.md']) changedFiles.push('SOUL.md')
-      if (workingStatus.localContentHashes['MEMORY.md'] !== workingStatus.publishedContentHashes['MEMORY.md']) changedFiles.push('MEMORY.md')
-      if (workingStatus.localContentHashes['skills.json'] !== workingStatus.publishedContentHashes['skills.json']) changedFiles.push('skills.json')
-    } else {
-      changedFiles = ['SOUL.md', 'MEMORY.md', 'skills.json']
-    }
-  }
+  const localChangeStatus = localChangeStatusView(workingStatus)
 
   return (
     <Surface title={title} subtitle={subtitle} footer={footer} tone="primary">
       <Box flexDirection="column">
         <Text color={headlineColor}>{headline}</Text>
         <Text color={theme.textSubtle}>{detail}</Text>
-        {isPublish && changedFiles.length > 0 && (
+        {isPublish && (
+          <Box marginTop={1}>
+            <SaveSnapshotStatusLine status={localChangeStatus} />
+          </Box>
+        )}
+        {!isPublish && (
           <Box marginTop={1}>
-            <Text>
-              <Text color={theme.textSubtle}>ready to save: </Text>
-              <Text color={theme.accentMint} bold>{changedFiles.join(', ')}</Text>
-            </Text>
+            <Text color={theme.accentPeach}>Overwrite your local files?</Text>
           </Box>
         )}
       </Box>
@@ -85,3 +78,18 @@ export const RecoveryConfirmScreen: React.FC<RecoveryConfirmScreenProps> = ({ mo
     </Surface>
   )
 }
+
+const SaveSnapshotStatusLine: React.FC<{ status: LocalChangeStatusView }> = ({ status }) => {
+  if (status.hasLocalChanges) {
+    return (
+      <Text>
+        <Text color={theme.textSubtle}>Local changes detected: </Text>
+        <Text color="#e87070" bold>{status.files.length > 0 ? status.files.join(', ') : 'local files differ from saved snapshot'}</Text>
+      </Text>
+    )
+  }
+
+  const color = status.tone === 'ok' ? theme.accentMint : status.tone === 'warn' ? theme.accentPeach : theme.dim
+  const label = status.detail === 'None detected' ? 'No local changes detected.' : status.detail
+  return <Text color={color}>{label}</Text>
+}

package/src/identity/hub/screens/StorageCredentialScreen.tsx

@@ -82,6 +82,9 @@ export const StorageCredentialScreen: React.FC<StorageCredentialScreenProps> = (
             <Text key={line} color={theme.dim}>- {line}</Text>
           ))}
         </Box>
+        <Box marginTop={1}>
+          <Text color={theme.accentPeach}>Remove the token from this machine?</Text>
+        </Box>
         <Box marginTop={1}>
           <Select<StorageCredentialAction>
             options={[

package/src/ui/Select.tsx

@@ -73,7 +73,7 @@ export function Select<T>({
     else if (key.return) {
       const selected = options[index]
       if (isSelectableOption(selected)) onSubmit(selected.value)
-    } else if (key.escape) {
+    } else if (key.escape || (key.ctrl && input === 'c')) {
       onCancel?.()
     }
   })

package/src/ui/Surface.tsx

@@ -27,7 +27,7 @@ export const Surface: React.FC<SurfaceProps> = ({
 }) => {
   const borderColor = toneColor[tone]
   return (
-    <Box flexDirection="column" borderStyle="round" borderColor={borderColor} paddingX={2} paddingY={0}>
+    <Box flexDirection="column" borderStyle="round" borderColor={borderColor} paddingX={2} paddingY={0} width="100%">
       <Box flexDirection="column">
         <Text color={borderColor} bold>{title}</Text>
         {subtitle ? (

package/src/ui/TextInput.tsx

@@ -1,7 +1,15 @@
-import React, { useState } from 'react'
-import { Box, Text } from 'ink'
+import React, { useState, useRef, useEffect } from 'react'
+import { Box, Text, useStdout } from 'ink'
 import { theme } from './theme.js'
 import { useAppInput } from '../app/input/AppInputProvider.js'
+import { moveVerticalVisual } from '../chat/chatInputState.js'
+import {
+  getVisualLineIndex,
+  getVisualLines,
+} from '../chat/textCursor.js'
+
+// ConversationStack padding=1 (2) + Surface border (2) + Surface paddingX=2 (4) + '> ' prefix (2) = 10
+const DEFAULT_CHROME_WIDTH = 10
 
 type TextInputProps = {
   label?: string
@@ -9,62 +17,116 @@ type TextInputProps = {
   isSecret?: boolean
   initialValue?: string
   allowEmpty?: boolean
+  multiline?: boolean
+  chromeWidth?: number
   maxLength?: number
   validate?: (value: string) => string | null
   onSubmit: (value: string) => void
   onCancel?: () => void
 }
 
+type RenderedTextInputLine = {
+  visualLineIndex: number
+  node: React.ReactNode
+}
+
 export function TextInput({
   label,
   placeholder,
   isSecret,
   initialValue = '',
   allowEmpty = false,
+  multiline = false,
+  chromeWidth = DEFAULT_CHROME_WIDTH,
   maxLength = 4096,
   validate,
   onSubmit,
   onCancel,
 }: TextInputProps) {
+  const { stdout } = useStdout()
   const [value, setValue] = useState(initialValue)
+  const [cursor, setCursor] = useState(initialValue.length)
+  const [preferredColumn, setPreferredColumn] = useState<number | null>(null)
   const [error, setError] = useState<string | null>(null)
 
+  // Keep a columns state updated via resize, matching ChatInput's pattern exactly
+  const [columns, setColumns] = useState<number>(() => Math.floor(stdout?.columns ?? 80))
+  useEffect(() => {
+    if (!stdout) return
+    const handleResize = () => setColumns(Math.floor(stdout.columns ?? 80))
+    stdout.on('resize', handleResize)
+    return () => { stdout.off('resize', handleResize) }
+  }, [stdout])
+
+  const wrapWidth = textInputWrapWidth(columns, chromeWidth)
+
+  // Sync refs during render so the input handler always reads fresh values,
+  // even if AppInputProvider fires before the next useEffect cycle updates handlerRef.
+  const stateRef = useRef({ value, cursor, preferredColumn, wrapWidth })
+  stateRef.current = { value, cursor, preferredColumn, wrapWidth }
+
   useAppInput((input, key) => {
+    const { value: val, cursor: cur, preferredColumn: prefCol, wrapWidth: ww } = stateRef.current
+
     if (key.return) {
-      if (!allowEmpty && value.trim().length === 0) {
+      if (!allowEmpty && val.trim().length === 0) {
         setError('value cannot be empty')
         return
       }
-      const validationError = validate?.(value) ?? null
+      const validationError = validate?.(val) ?? null
       if (validationError) {
         setError(validationError)
         return
       }
       setError(null)
-      onSubmit(value)
+      onSubmit(val)
       return
     }
-    if (key.escape) {
+    if (key.escape || (key.ctrl && input === 'c')) {
       onCancel?.()
       return
     }
+    if (key.leftArrow) {
+      setCursor(Math.max(0, cur - 1))
+      setPreferredColumn(null)
+      return
+    }
+    if (key.rightArrow) {
+      setCursor(Math.min(val.length, cur + 1))
+      setPreferredColumn(null)
+      return
+    }
+    if (multiline && (key.upArrow || key.downArrow)) {
+      const result = moveVerticalVisual(val, cur, key.upArrow ? -1 : 1, ww, prefCol)
+      if (result.kind === 'moved') setCursor(result.cursor)
+      setPreferredColumn(result.preferredColumn)
+      return
+    }
     if (key.backspace || key.delete) {
-      setValue(v => v.slice(0, -1))
+      if (cur === 0) return
+      setValue(val.slice(0, cur - 1) + val.slice(cur))
+      setCursor(cur - 1)
+      setPreferredColumn(null)
       if (error) setError(null)
       return
     }
     if (key.ctrl && input === 'u') {
       setValue('')
+      setCursor(0)
+      setPreferredColumn(null)
       if (error) setError(null)
       return
     }
-    if (key.ctrl || key.meta || key.leftArrow || key.rightArrow || key.upArrow || key.downArrow || key.tab) {
+    if (key.ctrl || key.meta || key.upArrow || key.downArrow || key.tab) {
       return
     }
     if (input) {
       const clean = input.replace(/[\r\n]/g, '')
       if (clean) {
-        setValue(v => (v + clean).slice(0, maxLength))
+        const next = (val.slice(0, cur) + clean + val.slice(cur)).slice(0, maxLength)
+        setValue(next)
+        setCursor(Math.min(cur + clean.length, maxLength))
+        setPreferredColumn(null)
         if (error) setError(null)
       }
     }
@@ -72,26 +134,83 @@ export function TextInput({
 
   const display = isSecret ? '*'.repeat(value.length) : value
   const showPlaceholder = value.length === 0 && placeholder
+  const renderedLines = multiline
+    ? renderTextInputLines(display, cursor, true, wrapWidth)
+    : []
 
   return (
     <Box flexDirection="column">
       {label ? <Text color={theme.dim}>{label}</Text> : null}
-      <Box flexDirection="row">
-        <Text color={theme.accentPrimary}>{'> '}</Text>
-        {showPlaceholder ? (
-          <>
-            <Text color={theme.accentPrimary}>|</Text>
-            <Text color={theme.dim}>{placeholder}</Text>
-          </>
-        ) : (
-          <>
-            <Text color={theme.text}>{display}</Text>
-            <Text color={theme.accentPrimary}>|</Text>
-          </>
-        )}
-      </Box>
+      {multiline && !showPlaceholder ? (
+        <Box flexDirection="column">
+          {renderedLines.map(line => (
+            <Box key={line.visualLineIndex} flexDirection="row">
+              <Text color={line.visualLineIndex === 0 ? theme.accentPrimary : theme.dim}>
+                {line.visualLineIndex === 0 ? '> ' : '  '}
+              </Text>
+              <Box width={wrapWidth}>{line.node}</Box>
+            </Box>
+          ))}
+        </Box>
+      ) : (
+        <Box flexDirection="row">
+          <Text color={theme.accentPrimary}>{'> '}</Text>
+          <Box width={wrapWidth}>
+            {showPlaceholder ? (
+              <Text wrap={multiline ? 'wrap' : 'truncate-end'}>
+                <Text backgroundColor={theme.accentMint} color="#08110c">{' '}</Text>
+                <Text color={theme.dim}>{placeholder}</Text>
+              </Text>
+            ) : (
+              <Text color={theme.text} wrap="truncate-end">
+                {display.slice(0, cursor)}
+                <Text backgroundColor={theme.accentMint} color="#08110c">{display[cursor] ?? ' '}</Text>
+                {display.slice(cursor + 1)}
+              </Text>
+            )}
+          </Box>
+        </Box>
+      )}
       {error ? <Text color="#e87070">{error}</Text> : null}
     </Box>
   )
 }
 
+export function textInputWrapWidth(columns: number, chromeWidth = DEFAULT_CHROME_WIDTH): number {
+  return Math.max(1, Math.floor(columns) - Math.max(0, Math.floor(chromeWidth)))
+}
+
+export function renderTextInputLines(
+  value: string,
+  cursor: number,
+  showCursor: boolean,
+  wrapWidth: number,
+): RenderedTextInputLine[] {
+  const lines = getVisualLines(value, wrapWidth)
+  const cursorLine = getVisualLineIndex(lines, cursor)
+
+  return lines.map((line, visualLineIndex) => {
+    const text = value.slice(line.start, line.end)
+    if (!showCursor || visualLineIndex !== cursorLine) {
+      return {
+        visualLineIndex,
+        node: <Text color={theme.text} wrap="wrap">{text || ' '}</Text>,
+      }
+    }
+
+    const column = Math.max(0, Math.min(cursor - line.start, text.length))
+    const before = text.slice(0, column)
+    const atChar = text[column] ?? ' '
+    const after = text.slice(column + 1)
+    return {
+      visualLineIndex,
+      node: (
+        <Text color={theme.text} wrap="wrap">
+          {before}
+          <Text backgroundColor={theme.accentMint} color="#08110c">{atChar}</Text>
+          {after}
+        </Text>
+      ),
+    }
+  })
+}