ethagent 1.1.2 → 2.0.0

package/src/chat/ChatScreen.tsx

@@ -18,7 +18,7 @@ import { SessionStatus, formatTokens } from './SessionStatus.js'
 import { formatModelDisplayName } from '../models/modelDisplay.js'
 import { toggleReasoningRow, type MessageRow } from './MessageList.js'
 import { ConversationStack } from './ConversationStack.js'
-import { ModelPicker, type ModelPickerSelection } from '../models/ModelPicker.js'
+import type { ModelPickerSelection } from '../models/ModelPicker.js'
 import type { ModelPickerContextFit } from '../models/modelPickerOptions.js'
 import type { CopyResult } from '../utils/clipboard.js'
 import { useKeybinding, useRegisterKeybindingContext } from '../app/keybindings/KeybindingProvider.js'
@@ -55,13 +55,15 @@ import type {
 } from '../tools/contracts.js'
 import {
   buildBaseMessages,
-  formatBytes,
   sessionMessagesToRows,
   type TurnCheckpoint,
 } from './chatScreenUtils.js'
 import { ChatBottomPane, type ContextLimitState, type CopyPickerState, type IdentityOverlayState, type Overlay } from './ChatBottomPane.js'
 import { setTokenIdentity, getIdentityStatus } from '../storage/identity.js'
 import type { IdentityHubResult } from '../identity/hub/IdentityHub.js'
+import { continuityWorkingTreeStatus } from '../identity/continuity/storage.js'
+import { listPublishedContinuitySnapshots } from '../identity/continuity/snapshots.js'
+import { localChangeStatusView } from '../identity/hub/model/continuity.js'
 import {
   buildResumedSessionState,
   promptHistoryFromSessionMessages,
@@ -181,6 +183,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
   const pendingContinuityEditReviewRef = useRef<ContinuityEditReviewState | null>(null)
   const contextModelSwitchPromptRef = useRef<string | null>(null)
   const mcpManagerRef = useRef<McpManager | null>(null)
+  const savePromptShownRef = useRef<boolean>(false)
 
   useEffect(() => { rowsRef.current = rows }, [rows])
   useEffect(() => { overlayRef.current = overlay }, [overlay])
@@ -206,6 +209,29 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
     })()
   }, [])
 
+  useEffect(() => {
+    if (savePromptShownRef.current) return
+    savePromptShownRef.current = true
+    void (async () => {
+      try {
+        const identity = configRef.current.identity
+        if (!identity) return
+        const [latest] = await listPublishedContinuitySnapshots(identity, 1)
+        const status = await continuityWorkingTreeStatus(identity, latest)
+        if (!localChangeStatusView(status).hasLocalChanges) return
+        if (overlayRef.current !== 'none') return
+        setIdentityOverlay({
+          initialAction: 'save-prompt',
+          existing: { address: identity.address },
+        })
+        overlayRef.current = 'identity'
+        setOverlay('identity')
+      } catch {
+        // best-effort; skip prompt on any error
+      }
+    })()
+  }, [])
+
   useEffect(() => {
     void (async () => {
       try {
@@ -1107,7 +1133,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
         })
         overlayRef.current = 'identity'
         setOverlay('identity')
-        pushNote('opening snapshot approval.', 'dim')
+        pushNote('opening snapshot signature.', 'dim')
         return
       }
       overlayRef.current = 'none'
@@ -1363,8 +1389,8 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
 
   const contextLine = `${config.provider} · ${formatModelDisplayName(config.provider, config.model, { maxLength: 24 })} · ${compressHome(cwd)}`
   const tipLine = streaming
-    ? 'tip: you can keep typing and press enter to queue the next message · shift+enter for newline'
-    : 'tip: type /help to get started · shift+enter for newline'
+    ? 'Tip: You can keep typing and press enter to queue the next message · shift+enter for newline'
+    : 'Tip: type /help to get started · shift+enter for newline'
 
   const placeholderHints = useMemo(() => {
     if (compactionUi) return ['compaction in progress · esc to cancel']
@@ -1373,30 +1399,24 @@ export const ChatScreen: React.FC<ChatScreenProps> = ({ config: initialConfig, o
 
   const exitHint = exitState.pending ? 'ctrl+c again to quit' : null
   const runtimeModeLabel = sessionModeLabel(mode)
-  const modeColor =
-    mode === 'plan'
-      ? theme.accentLavender
-      : mode === 'accept-edits'
-        ? theme.accentPeach
-        : theme.accentMint
   const footerRight = (
     <Box flexDirection="row">
       {exitHint ? (
         <>
-          <Text color={theme.accentPrimary}>{exitHint}</Text>
+          <Text color={theme.text}>{exitHint}</Text>
           <Text color={theme.dim}> · </Text>
         </>
       ) : null}
       {runtimeModeLabel ? (
         <>
-          <Text color={modeColor}>{runtimeModeLabel}</Text>
+          <Text bold>{runtimeModeLabel}</Text>
           <Text color={theme.dim}> (</Text>
-          <Text color={theme.accentMint}>shift+tab to cycle</Text>
+          <Text color={theme.accentPeriwinkle}>shift+tab to cycle</Text>
           <Text color={theme.dim}>) · </Text>
         </>
       ) : (
         <>
-          <Text color={theme.accentMint}>shift+tab to cycle</Text>
+          <Text color={theme.accentPeriwinkle}>shift+tab to cycle</Text>
           <Text color={theme.dim}> · </Text>
         </>
       )}

package/src/chat/ContextLimitView.tsx

@@ -64,20 +64,20 @@ export const ContextLimitView: React.FC<ContextLimitViewProps> = ({
   })
 
   return (
-    <Box flexDirection="column" borderStyle="round" borderColor={theme.accentPeach} paddingX={1}>
-      <Text color={theme.accentPeach} bold>context limit</Text>
+    <Box flexDirection="column" borderStyle="round" borderColor={theme.accentPeriwinkle} paddingX={1}>
+      <Text color={theme.accentPeriwinkle} bold>context limit</Text>
       <Text color={theme.dim}>
         {`Context ${usage.percent}% · ~${formatTokens(usage.usedTokens)} / ${formatTokens(usage.windowTokens)} tokens (${usage.source}).`}
       </Text>
       {usage.percent >= 100 ? (
-        <Text color={theme.accentPeach}>
+        <Text color={theme.accentPeriwinkle}>
           This transcript is over the selected model's estimated window. You can still send, but summarizing first is safer.
         </Text>
       ) : null}
       <Text color={theme.textSubtle}>{`Pending: ${promptPreview || '(empty)'}`}</Text>
       <Box flexDirection="column" marginTop={1}>
         {CONTEXT_LIMIT_OPTIONS.map((option, index) => (
-          <Text key={option.action} color={index === selected ? theme.accentPrimary : theme.text}>
+          <Text key={option.action} color={index === selected ? theme.accentPeriwinkle : theme.text}>
             {index === selected ? '> ' : '  '}
             {option.label}
             <Text color={theme.dim}>{` · ${option.detail}`}</Text>

package/src/chat/ContinuityEditReviewView.tsx

@@ -19,32 +19,16 @@ export const ContinuityEditReviewView: React.FC<{
   onCancel: () => void
 }> = ({ review, onSelect, onCancel }) => (
   <Surface
-    title="Private Continuity Updated"
-    subtitle="Review the file, then save an encrypted snapshot."
-    footer="enter select · esc later"
+    title={`${review.file} Updated`}
+    footer="enter select · esc dismiss"
   >
-    <Box flexDirection="column">
-      <Text color={theme.accentMint}>{review.summary}</Text>
-      <Box marginTop={1} flexDirection="column">
-        <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>
-      </Box>
-    </Box>
+    <Text color={theme.accentPeriwinkle}>{displayContinuityReviewText(review.summary)}</Text>
     <Box marginTop={1}>
       <Select<ContinuityEditReviewAction>
         options={[
-          { value: 'open', label: `open ${review.file}`, hint: 'review the edited private file now' },
-          { value: 'save-publish', label: 'save snapshot now', hint: 'go directly to wallet approval' },
-          { value: 'later', label: 'later', hint: 'keep the local draft unsaved' },
+          { value: 'open', label: `Open ${review.file}`, hint: 'Review in editor' },
+          { value: 'save-publish', label: 'Save Snapshot', hint: 'Wallet signature' },
+          { value: 'later', label: 'Dismiss', hint: 'Save later from Identity Hub' },
         ]}
         onSubmit={onSelect}
         onCancel={onCancel}
@@ -52,3 +36,7 @@ export const ContinuityEditReviewView: React.FC<{
     </Box>
   </Surface>
 )
+
+function displayContinuityReviewText(value: string): string {
+  return value ? value[0]!.toUpperCase() + value.slice(1) : value
+}

package/src/chat/CopyPicker.tsx

@@ -49,4 +49,3 @@ export const CopyPicker: React.FC<CopyPickerProps> = ({ turnText, turnLabel, onD
   )
 }
 
-

package/src/chat/MessageList.tsx

@@ -3,14 +3,25 @@ import { Box, Text } from 'ink'
 import { theme } from '../ui/theme.js'
 import { ProgressBar } from '../ui/ProgressBar.js'
 import { Spinner } from '../ui/Spinner.js'
-import { hidesSuccessfulToolResultContent } from './toolResultDisplay.js'
+
+export type ToolCallResult = {
+  content: string
+  summary: string
+  isError: boolean
+}
 
 export type MessageRow =
   | { role: 'user'; id: string; content: string }
   | { role: 'assistant'; id: string; content: string; liveTail?: string; streaming?: boolean }
   | { role: 'thinking'; id: string; content: string; liveTail?: string; streaming?: boolean; expanded?: boolean; showCursor?: boolean }
-  | { role: 'tool_use'; id: string; name: string; summary: string; input?: string }
-  | { role: 'tool_result'; id: string; name: string; summary: string; content: string; isError?: boolean }
+  | {
+      role: 'tool_call'
+      id: string
+      name: string
+      summary: string
+      input?: string
+      result?: ToolCallResult
+    }
   | { role: 'note'; id: string; kind: 'info' | 'error' | 'dim'; content: string }
   | {
       role: 'progress'
@@ -43,7 +54,7 @@ type InlineToken =
 
 const MAX_RENDERED_MESSAGE_CHARS = 12_000
 const MAX_RENDERED_REASONING_CHARS = 10_000
-const ASSISTANT_ACCENT = theme.accentMint
+const ASSISTANT_ACCENT = theme.accentPeriwinkle
 const UNREADABLE_REASONING_TEXT = 'reasoning output was not readable text'
 
 const MessageListInner: React.FC<MessageListProps> = ({ rows }) => (
@@ -54,18 +65,27 @@ const MessageListInner: React.FC<MessageListProps> = ({ rows }) => (
 
 export const MessageList = React.memo(MessageListInner)
 
+function isInspectableRole(role: MessageRow['role']): boolean {
+  return role === 'thinking'
+}
+
 export function toggleLatestReasoningRow(rows: MessageRow[]): MessageRow[] {
-  return toggleReasoningRow(rows)
+  return toggleInspectableRow(rows)
 }
 
 export function toggleReasoningRow(rows: MessageRow[], rowId?: string): MessageRow[] {
+  return toggleInspectableRow(rows, rowId)
+}
+
+export function toggleInspectableRow(rows: MessageRow[], rowId?: string): MessageRow[] {
   let index = -1
   if (rowId) {
-    index = rows.findIndex(row => row.id === rowId && row.role === 'thinking')
+    index = rows.findIndex(row => row.id === rowId && isInspectableRole(row.role))
   }
   if (index === -1) {
     for (let cursor = rows.length - 1; cursor >= 0; cursor -= 1) {
-      if (rows[cursor]?.role === 'thinking') {
+      const role = rows[cursor]?.role
+      if (role && isInspectableRole(role)) {
         index = cursor
         break
       }
@@ -73,10 +93,13 @@ export function toggleReasoningRow(rows: MessageRow[], rowId?: string): MessageR
   }
   if (index === -1) return rows
   const row = rows[index]
-  if (!row || row.role !== 'thinking') return rows
-  const next = rows.slice()
-  next[index] = { ...row, expanded: !row.expanded }
-  return next
+  if (!row) return rows
+  if (row.role === 'thinking') {
+    const next = rows.slice()
+    next[index] = { ...row, expanded: !row.expanded }
+    return next
+  }
+  return rows
 }
 
 const RowViewInner: React.FC<{ row: MessageRow }> = ({ row }) => {
@@ -90,7 +113,7 @@ const RowViewInner: React.FC<{ row: MessageRow }> = ({ row }) => {
         ) : null}
         {lines.map((line, i) => (
           <Text key={i}>
-            <Text color={i === 0 ? theme.accentMint : theme.dim}>{i === 0 ? '> ' : '  '}</Text>
+            <Text color={i === 0 ? theme.accentPeriwinkle : theme.dim}>{i === 0 ? '> ' : '  '}</Text>
             <Text color={theme.textSubtle}>{line}</Text>
           </Text>
         ))}
@@ -115,7 +138,7 @@ const RowViewInner: React.FC<{ row: MessageRow }> = ({ row }) => {
       return (
         <Box flexDirection="column" marginTop={1} borderStyle="round" borderColor={borderColor} paddingX={1}>
           <Text>
-            <Text color={theme.accentPeach} bold>reasoning</Text>
+            <Text color={theme.accentPeriwinkle} bold>reasoning</Text>
             <Text color={theme.dim}> · expanded · alt+t collapse</Text>
           </Text>
           <ReasoningBody content={text} showCursor={showCursor} />
@@ -125,7 +148,7 @@ const RowViewInner: React.FC<{ row: MessageRow }> = ({ row }) => {
     return (
       <Box flexDirection="column" marginTop={1} borderStyle="round" borderColor={borderColor} paddingX={1}>
         <Text>
-          <Text color={theme.accentPeach} bold>reasoning</Text>
+          <Text color={theme.accentPeriwinkle} bold>reasoning</Text>
           <Text color={theme.dim}> · collapsed · alt+t inspect</Text>
         </Text>
         <Text color={theme.textSubtle}>
@@ -136,39 +159,27 @@ const RowViewInner: React.FC<{ row: MessageRow }> = ({ row }) => {
     )
   }
 
-  if (row.role === 'tool_use') {
+  if (row.role === 'tool_call') {
+    const result = row.result
+    const inputPreview = row.input ? truncateToolInputForLine(row.input, 60) : ''
     return (
-      <Box flexDirection="column" marginTop={1} borderStyle="round" borderColor={theme.border} paddingX={1}>
-        <Text color={theme.accentNeutral} bold>{`tool · ${row.name}`}</Text>
-        <Text color={theme.dim}>{row.summary}</Text>
-        {row.input ? <Text color={theme.textSubtle}>{row.input}</Text> : null}
-      </Box>
-    )
-  }
-
-  if (row.role === 'tool_result') {
-    const hideContent = hidesSuccessfulToolResultContent(row.name, row.isError)
-    return (
-      <Box
-        flexDirection="column"
-        marginTop={1}
-        borderStyle="round"
-        borderColor={row.isError ? '#a84c4c' : theme.border}
-        paddingX={1}
-      >
-        <Text color={row.isError ? '#e87070' : theme.accentSecondary} bold>{`result · ${row.name}`}</Text>
-        <Text color={theme.dim}>{row.summary}</Text>
-        {row.isError ? (
-          <Text color="#f1b0b0">{row.content}</Text>
-        ) : hideContent || !row.content ? null : (
-          <AssistantBody content={row.content} />
-        )}
+      <Box marginTop={1}>
+        <Text>
+          <Text color={theme.dim}>{'· '}</Text>
+          <Text color={theme.accentPeriwinkle} bold>{row.name}</Text>
+          {inputPreview ? <Text color={theme.textSubtle}>{`  ${inputPreview}`}</Text> : null}
+          {result ? (
+            <Text color={result.isError ? theme.accentError : theme.dim}>{`  ${result.summary}`}</Text>
+          ) : (
+            <Text color={theme.dim}>{'  running…'}</Text>
+          )}
+        </Text>
       </Box>
     )
   }
 
   if (row.role === 'note') {
-    const color = row.kind === 'error' ? '#e87070' : row.kind === 'dim' ? theme.dim : theme.accentInfo
+    const color = row.kind === 'error' ? theme.accentError : row.kind === 'dim' ? theme.dim : theme.accentPeriwinkle
     return (
       <Box marginTop={1}>
         <Text color={color}>{row.content}</Text>
@@ -178,7 +189,7 @@ const RowViewInner: React.FC<{ row: MessageRow }> = ({ row }) => {
 
   return (
     <Box flexDirection="column" marginTop={1}>
-      <Text color={theme.accentMint} bold>{row.title}</Text>
+      <Text color={theme.accentPeriwinkle} bold>{row.title}</Text>
       {row.indeterminate ? (
         <ProgressSpinner row={row} />
       ) : (
@@ -198,7 +209,13 @@ const ProgressSpinner: React.FC<{ row: Extract<MessageRow, { role: 'progress' }>
 }
 
 export function reasoningBorderColor(row: Extract<MessageRow, { role: 'thinking' }>): string {
-  return row.streaming ? theme.accentPeach : theme.border
+  return row.streaming ? theme.accentPeriwinkle : theme.border
+}
+
+function truncateToolInputForLine(input: string, max: number): string {
+  const flat = input.replace(/\s+/g, ' ').trim()
+  if (flat.length <= max) return flat
+  return `${flat.slice(0, Math.max(1, max - 1))}…`
 }
 
 export function reasoningCursorVisible(row: Extract<MessageRow, { role: 'thinking' }>): boolean {
@@ -370,7 +387,7 @@ const InlineText: React.FC<{ text: string; color: string; bold?: boolean }> = ({
 const ThinkingCursor: React.FC<{ active: boolean; hasPreview: boolean }> = ({ active, hasPreview }) => {
   if (!active) return null
   return (
-    <Text color={theme.accentPeach}>
+    <Text color={theme.accentPeriwinkle}>
       {hasPreview ? ' ' : ''}
       <StreamCursor active />
     </Text>
@@ -488,7 +505,7 @@ function parseMarkdownBlocks(markdown: string): MarkdownBlock[] {
   return blocks
 }
 
-function codeAccent(lang: string | null): string {
+function codeAccent(_lang: string | null): string {
   return ASSISTANT_ACCENT
 }
 

package/src/chat/PermissionPrompt.tsx

@@ -23,23 +23,23 @@ export const PermissionPrompt: React.FC<PermissionPromptProps> = ({ request, onD
     >
       {request.kind === 'private-continuity-edit' ? (
         <Box flexDirection="column" marginBottom={1}>
-          <Text color={theme.accentPeach}>{request.changeSummary}</Text>
+          <Text color={theme.accentPeriwinkle}>{displayPermissionText(request.changeSummary)}</Text>
           <Text color={theme.textSubtle}>
-            Not reversible by /rewind. A private identity-history snapshot is saved before the edit is applied.
+            Not reversible by /rewind. A private identity-history snapshot is saved before writing.
           </Text>
           <Box marginTop={1}>
             <Text color={theme.textSubtle}>target</Text>
           </Box>
           <Text color={theme.text}>{request.file}</Text>
           <Box marginTop={1}>
-            <Text color={theme.accentPrimary}>diff</Text>
+            <Text color={theme.accentPeriwinkle}>diff</Text>
           </Box>
           <Text color={theme.text}>{request.diff}</Text>
         </Box>
       ) : null}
       {request.kind === 'private-continuity-read' ? (
         <Box flexDirection="column" marginBottom={1}>
-          <Text color={theme.accentPeach}>read private {request.file}</Text>
+          <Text color={theme.accentPeriwinkle}>read private {request.file}</Text>
           <Text color={theme.textSubtle}>This reveals private identity continuity to the model for this turn.</Text>
           <Box marginTop={1}>
             <Text color={theme.textSubtle}>range</Text>
@@ -49,20 +49,20 @@ export const PermissionPrompt: React.FC<PermissionPromptProps> = ({ request, onD
       ) : null}
       {request.kind === 'edit' || request.kind === 'write' || request.kind === 'delete' ? (
         <Box flexDirection="column" marginBottom={1}>
-          <Text color={theme.accentPeach}>{request.changeSummary}</Text>
+          <Text color={theme.accentPeriwinkle}>{displayPermissionText(request.changeSummary)}</Text>
           <Box marginTop={1}>
             <Text color={theme.textSubtle}>before</Text>
           </Box>
           <Text color={theme.textSubtle}>{request.before || '(empty)'}</Text>
           <Box marginTop={1}>
-            <Text color={theme.accentPrimary}>after</Text>
+            <Text color={theme.accentPeriwinkle}>after</Text>
           </Box>
           <Text color={theme.text}>{request.after || '(empty)'}</Text>
         </Box>
       ) : null}
       {request.kind === 'bash' && request.warning ? (
         <Box marginBottom={1}>
-          <Text color="#e87070">{request.warning}</Text>
+          <Text color={theme.accentError}>{request.warning}</Text>
         </Box>
       ) : null}
       <Select options={options} onSubmit={onDecision} onCancel={onCancel} />
@@ -127,8 +127,8 @@ export function permissionOptionsForRequest(request: PermissionRequest): Array<{
 
   if (request.kind === 'private-continuity-edit') {
     return [
-      { value: 'allow-once', label: 'approve once', hint: `apply this edit to ${request.file}` },
-      { value: 'deny', label: 'deny', hint: 'keep private continuity unchanged' },
+      { value: 'allow-once', label: 'Approve Once', hint: `Apply this edit to ${request.file}` },
+      { value: 'deny', label: 'Deny', hint: 'Keep private continuity unchanged' },
     ]
   }
 
@@ -151,3 +151,7 @@ export function permissionOptionsForRequest(request: PermissionRequest): Array<{
     { value: 'deny', label: 'deny', hint: 'return a denial back to the model' },
   ]
 }
+
+function displayPermissionText(value: string): string {
+  return value ? value[0]!.toUpperCase() + value.slice(1) : value
+}

package/src/chat/PlanApprovalView.tsx

@@ -70,11 +70,11 @@ export const PlanApprovalView: React.FC<PlanApprovalViewProps> = ({
             const active = optionIndex === index
             return (
               <Box key={option.value} flexDirection="row">
-                <Text color={active ? theme.accentMint : theme.dim}>
+                <Text color={active ? theme.accentPeriwinkle : theme.dim}>
                   {active ? '> ' : '  '}
                   {optionIndex + 1}.{' '}
                 </Text>
-                <Text color={active ? theme.accentMint : theme.text} bold={active}>
+                <Text color={active ? theme.accentPeriwinkle : theme.text} bold={active}>
                   {option.label}
                 </Text>
               </Box>
@@ -82,7 +82,7 @@ export const PlanApprovalView: React.FC<PlanApprovalViewProps> = ({
           })}
         </Box>
         <Box flexDirection="column" marginLeft={4} flexShrink={1}>
-          <Text color={theme.accentMint} bold>{selected.title}</Text>
+          <Text color={theme.accentPeriwinkle} bold>{selected.title}</Text>
           <Text color={theme.dim}>{selected.detail(contextLabel)}</Text>
         </Box>
       </Box>

package/src/chat/ResumeView.tsx

@@ -26,8 +26,6 @@ export const CLEAR_ALL_SESSIONS_VALUE = '__clear_all_sessions__'
 export const ResumeView: React.FC<ResumeViewProps> = ({ currentSessionId, onResume, onClearAll, onCancel }) => {
   const [state, setState] = useState<State>({ kind: 'loading' })
 
-  // Allow ESC to close the view during loading / error states
-  // (Select handles ESC only when it's rendered in the 'ready' state)
   const escActive = state.kind === 'loading' || state.kind === 'error' || (state.kind === 'ready' && state.sessions.length === 0)
   useAppInput((_input, key) => {
     if (key.escape) onCancel()
@@ -75,7 +73,7 @@ export const ResumeView: React.FC<ResumeViewProps> = ({ currentSessionId, onResu
         <Box flexDirection="column" marginBottom={1}>
           <Text color={theme.dim}>Removes saved chats and resume context from this machine.</Text>
           <Text color={theme.dim}>Config, identities, keys, and local models stay.</Text>
-          {state.error ? <Text color="#e87070">{state.error}</Text> : null}
+          {state.error ? <Text color={theme.accentError}>{state.error}</Text> : null}
         </Box>
         <Select<'back' | 'clear'>
           options={[
@@ -212,7 +210,6 @@ export function buildResumeOptions(
     }
   }
 
-  // Utility section sits below all session groups with a visual gap
   options.push(manageSpacer)
   options.push(clearOption)
 

package/src/chat/RewindView.tsx

@@ -312,7 +312,7 @@ function buildActionOptions(canRestoreConversation: boolean): Array<SelectOption
 
 const CompactPreview: React.FC<{ entry: RewindEntry }> = ({ entry }) => (
   <Box flexDirection="column" marginTop={1}>
-    <Text color={theme.accentPrimary}>{entry.relativePath}</Text>
+    <Text color={theme.accentPeriwinkle}>{entry.relativePath}</Text>
     <Text color={theme.dim}>{entry.promptSnippet || '(prompt snippet unavailable for older checkpoints)'}</Text>
   </Box>
 )
@@ -323,7 +323,7 @@ const ActionPreview: React.FC<{
   canRestoreConversation: boolean
 }> = ({ entry, selectedAction, canRestoreConversation }) => (
   <Box flexDirection="column" marginTop={1}>
-    <Text color={theme.accentPrimary}>{entry.relativePath}</Text>
+    <Text color={theme.accentPeriwinkle}>{entry.relativePath}</Text>
     <Text color={theme.dim}>{formatTimestamp(entry.createdAt)} · {entry.changeSummary}</Text>
     <Text color={theme.textSubtle}>
       {selectedAction === 'both'

package/src/chat/chatInputState.ts

@@ -73,7 +73,7 @@ export function moveThroughHistory(
   historyIndex: number,
   direction: 1 | -1,
   draftBuffer: ChatBuffer,
-  preferredColumn: number | null,
+  _preferredColumn: number | null,
 ): { preview: HistoryPreviewState; buffer: ChatBuffer } {
   const next = historyIndex + direction
   if (next < 0) {

package/src/chat/chatScreenUtils.ts

@@ -52,26 +52,37 @@ export function buildBaseMessages(
 
 export function sessionMessagesToRows(messages: SessionMessage[], nextRowId: () => string): MessageRow[] {
   const restored: MessageRow[] = []
+  const toolCallByUseId = new Map<string, Extract<MessageRow, { role: 'tool_call' }>>()
   for (const msg of messages) {
     if (msg.role === 'user') restored.push({ role: 'user', id: nextRowId(), content: msg.content })
     else if (msg.role === 'assistant') restored.push({ role: 'assistant', id: nextRowId(), content: msg.content })
     else if (msg.role === 'tool_use') {
-      restored.push({
-        role: 'tool_use',
+      const row: Extract<MessageRow, { role: 'tool_call' }> = {
+        role: 'tool_call',
         id: nextRowId(),
         name: msg.name,
         summary: msg.name,
         input: summarizeToolInput(msg.input),
-      })
+      }
+      restored.push(row)
+      toolCallByUseId.set(msg.toolUseId, row)
     } else if (msg.role === 'tool_result') {
-      restored.push({
-        role: 'tool_result',
-        id: nextRowId(),
-        name: msg.name,
-        summary: msg.isError ? `${msg.name} failed` : `${msg.name} completed`,
-        content: toolResultContentForRow(msg.name, msg.content, msg.isError),
-        isError: msg.isError,
-      })
+      const isError = Boolean(msg.isError)
+      const summary = isError ? `${msg.name} failed` : `${msg.name} completed`
+      const content = toolResultContentForRow(msg.name, msg.content, msg.isError)
+      const existing = toolCallByUseId.get(msg.toolUseId)
+      if (existing) {
+        existing.result = { content, summary, isError }
+        existing.name = msg.name
+      } else {
+        restored.push({
+          role: 'tool_call',
+          id: nextRowId(),
+          name: msg.name,
+          summary: msg.name,
+          result: { content, summary, isError },
+        })
+      }
     }
   }
   return restored

package/src/chat/chatSessionState.ts

@@ -49,7 +49,7 @@ export function resolveModelSelection(
         model: selection.model,
         baseUrl,
       },
-      notice: `local Hugging Face model ready. now using ${formatModelDisplayName('llamacpp', selection.model, { maxLength: 64 })}.`,
+      notice: `Local Hugging Face model ready. Now using ${formatModelDisplayName('llamacpp', selection.model, { maxLength: 64 })}.`,
       tone: 'info',
     }
   }
@@ -69,7 +69,7 @@ export function resolveModelSelection(
   return {
     kind: 'switch',
     config: nextConfig,
-    notice: `${selection.keyJustSet ? `${selection.provider} key saved.` : `${selection.provider} ready.`} now using ${nextConfig.provider} · ${formatModelDisplayName(nextConfig.provider, nextConfig.model, { maxLength: 64 })}.`,
+    notice: `${selection.keyJustSet ? `${selection.provider} key saved.` : `${selection.provider} ready.`} Now using ${nextConfig.provider} · ${formatModelDisplayName(nextConfig.provider, nextConfig.model, { maxLength: 64 })}.`,
     tone: 'dim',
   }
 }