ethagent 2.1.1 → 2.3.0

package/src/chat/display/toolResultDisplay.ts

@@ -0,0 +1,19 @@
+import { splitFileChangeResult } from '../../tools/fileDiff.js'
+
+const COMPACT_SUCCESS_TOOL_RESULTS = new Set([
+  'read_file',
+  'read_private_continuity_file',
+])
+
+export function hidesSuccessfulToolResultContent(name: string, isError?: boolean): boolean {
+  return !isError && COMPACT_SUCCESS_TOOL_RESULTS.has(name)
+}
+
+export function toolResultDiffContent(content: string, isError?: boolean): string | undefined {
+  if (isError) return undefined
+  return splitFileChangeResult(content).diff
+}
+
+export function toolResultTextContent(content: string): string {
+  return splitFileChangeResult(content).content
+}

package/src/chat/{ChatInput.tsx → input/ChatInput.tsx}

@@ -2,10 +2,10 @@ import fs from 'node:fs/promises'
 import path from 'node:path'
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { Box, Text, useStdout } from 'ink'
-import { theme } from '../ui/theme.js'
-import { readClipboardImage } from '../utils/clipboard.js'
-import { useAppInput } from '../app/input/AppInputProvider.js'
-import type { SlashSuggestion } from './commands.js'
+import { theme } from '../../ui/theme.js'
+import { readClipboardImage } from '../../utils/clipboard.js'
+import { useAppInput } from '../../app/input/AppInputProvider.js'
+import type { SlashSuggestion } from '../commands.js'
 import {
   beginHistoryPreview,
   canNavigateHistory as canNavigateHistoryState,
@@ -46,6 +46,8 @@ type PromptInputProps = {
   onModeChange?: (mode: 'prompt' | 'bash') => void
   footerRight?: React.ReactNode
   cwd?: string
+  seedText?: string | null
+  onSeedConsumed?: () => void
 }
 
 const MAX_LENGTH = 32_768
@@ -66,12 +68,14 @@ export const ChatInput: React.FC<PromptInputProps> = ({
   disabled,
   placeholderHints,
   queuedMessages = [],
-  prefix = '\u203a',
+  prefix = '›',
   slashSuggestions = [],
   mode = 'prompt',
   onModeChange,
   footerRight,
   cwd,
+  seedText,
+  onSeedConsumed,
 }) => {
   const { stdout } = useStdout()
   const [buffer, setBuffer] = useState<ChatBuffer>(emptyBuffer)
@@ -141,6 +145,15 @@ export const ChatInput: React.FC<PromptInputProps> = ({
     applyHistoryState(exitHistoryPreview(next))
   }, [applyHistoryState])
 
+  useEffect(() => {
+    if (seedText == null) return
+    const next: ChatBuffer = { value: seedText, cursor: seedText.length }
+    bufferRef.current = next
+    setBuffer(next)
+    applyHistoryState(exitHistoryPreview(next))
+    onSeedConsumed?.()
+  }, [seedText, applyHistoryState, onSeedConsumed])
+
   useEffect(() => {
     if (!placeholderHints || placeholderHints.length < 2) return
     const timer = setInterval(() => {
@@ -506,6 +519,22 @@ export const ChatInput: React.FC<PromptInputProps> = ({
 
   return (
     <Box flexDirection="column" width="100%">
+      {queuedMessages.length > 0 ? (
+        <Box marginLeft={2} marginBottom={1} flexDirection="column">
+          <Text color={theme.dim}>
+            {queuedMessages.length === 1 ? '1 message queued for next turn' : `${queuedMessages.length} messages queued for next turns`}
+          </Text>
+          {queuedMessages.slice(0, 3).map((message, i) => (
+            <Text key={`${i}-${message.slice(0, 24)}`}>
+              <Text color={theme.accentPeriwinkle}>{i === 0 ? '» ' : '  '}</Text>
+              <Text color={theme.textSubtle}>{summarizeQueuedMessage(message)}</Text>
+            </Text>
+          ))}
+          {queuedMessages.length > 3 ? (
+            <Text color={theme.dim}>+{queuedMessages.length - 3} more</Text>
+          ) : null}
+        </Box>
+      ) : null}
       <Box
         borderStyle="round"
         borderColor={borderColor}
@@ -545,7 +574,7 @@ export const ChatInput: React.FC<PromptInputProps> = ({
         <Box marginLeft={2} flexDirection="column">
           {filteredSuggestions.map((s, i) => (
             <Text key={s.name} color={i === suggestionIdx ? theme.accentPeriwinkle : theme.dim}>
-              {i === suggestionIdx ? '\u203a ' : '  '}/{s.name}
+              {i === suggestionIdx ? '› ' : '  '}/{s.name}
               <Text color={theme.dim}>  {s.summary}{i === suggestionIdx ? (s.executeOnEnter ? ' · enter runs' : ' · enter fills') : ''}</Text>
             </Text>
           ))}
@@ -555,7 +584,7 @@ export const ChatInput: React.FC<PromptInputProps> = ({
         <Box marginLeft={2} flexDirection="column">
           {fileSuggestions.slice(0, 8).map((s, i) => (
             <Text key={s.path} color={i === fileSuggestionIdx ? theme.accentPeriwinkle : theme.dim}>
-              {i === fileSuggestionIdx ? '\u203a ' : '  '}@{s.path}
+              {i === fileSuggestionIdx ? '› ' : '  '}@{s.path}
               <Text color={theme.dim}>  {i === fileSuggestionIdx ? 'tab/enter completes' : s.hint}</Text>
             </Text>
           ))}
@@ -564,22 +593,6 @@ export const ChatInput: React.FC<PromptInputProps> = ({
           ) : null}
         </Box>
       ) : null}
-      {queuedMessages.length > 0 ? (
-        <Box marginLeft={2} flexDirection="column">
-          <Text color={theme.dim}>
-            {queuedMessages.length === 1 ? '1 message queued for next turn' : `${queuedMessages.length} messages queued for next turns`}
-          </Text>
-          {queuedMessages.slice(0, 3).map((message, i) => (
-            <Text key={`${i}-${message.slice(0, 24)}`}>
-              <Text color={theme.accentPeriwinkle}>{i === 0 ? '» ' : '  '}</Text>
-              <Text color={theme.textSubtle}>{summarizeQueuedMessage(message)}</Text>
-            </Text>
-          ))}
-          {queuedMessages.length > 3 ? (
-            <Text color={theme.dim}>+{queuedMessages.length - 3} more</Text>
-          ) : null}
-        </Box>
-      ) : null}
       {footerRight ? (
         <Box marginLeft={2}>
           {footerRight}

package/src/chat/{TranscriptView.tsx → transcript/TranscriptView.tsx}

@@ -1,18 +1,17 @@
 import React, { useEffect, useMemo, useState } from 'react'
 import { Box, Text, useStdout } from 'ink'
-import { useAppInput } from '../app/input/AppInputProvider.js'
-import { MessageList, type MessageRow } from './MessageList.js'
-import { theme } from '../ui/theme.js'
+import { useAppInput } from '../../app/input/AppInputProvider.js'
+import { MessageList, type MessageRow } from '../MessageList.js'
+import { theme } from '../../ui/theme.js'
 import {
   anchorForScrollTop,
   buildLineOffsets,
   clampLine,
   estimateMessageRowHeight,
-  promptScrollTopForPageDown,
-  promptScrollTopForPageUp,
   resolveScrollTopFromAnchor,
+  scrollTopForPageDown,
+  scrollTopForPageUp,
   selectRowsForScrollTop,
-  type TranscriptWindowSelection,
   type TranscriptViewportState,
 } from './transcriptViewport.js'
 
@@ -24,10 +23,10 @@ type TranscriptViewProps = {
   onScrollabilityChange?: (canScroll: boolean) => void
 }
 
-const PROMPT_RESERVED_LINES = 11
-const OVERLAY_RESERVED_LINES = 16
+const PROMPT_RESERVED_LINES = 7
+const OVERLAY_RESERVED_LINES = 12
 const MIN_TRANSCRIPT_LINES = 6
-const MAX_TRANSCRIPT_LINES = 120
+const MAX_TRANSCRIPT_LINES = 240
 
 export const TranscriptView: React.FC<TranscriptViewProps> = ({
   rows,
@@ -64,15 +63,11 @@ export const TranscriptView: React.FC<TranscriptViewProps> = ({
     [metrics, viewportState],
   )
   const selection = useMemo(
-    () => trimSelectionToFocusedTurn(
-      selectRowsForScrollTop(
-        rows,
-        maxLines,
-        resolvedViewportState.scrollTopLine,
-        row => estimateMessageRowHeight(row, columns),
-      ),
+    () => selectRowsForScrollTop(
       rows,
-      resolvedViewportState,
+      maxLines,
+      resolvedViewportState.scrollTopLine,
+      row => estimateMessageRowHeight(row, columns),
     ),
     [columns, maxLines, resolvedViewportState, rows],
   )
@@ -97,12 +92,10 @@ export const TranscriptView: React.FC<TranscriptViewProps> = ({
 
   useAppInput((_input, key) => {
     if (key.pageUp) {
-      const target = promptScrollTopForPageUp(
-        rows,
-        metrics.offsets,
+      const target = scrollTopForPageUp(
         resolvedViewportState.scrollTopLine,
         metrics.maxScrollTop,
-        resolvedViewportState.followTail,
+        maxLines,
       )
       setViewportState(viewportForScrollTop(
         target,
@@ -111,11 +104,10 @@ export const TranscriptView: React.FC<TranscriptViewProps> = ({
         metrics.maxScrollTop,
       ))
     } else if (key.pageDown) {
-      const target = promptScrollTopForPageDown(
-        rows,
-        metrics.offsets,
+      const target = scrollTopForPageDown(
         resolvedViewportState.scrollTopLine,
         metrics.maxScrollTop,
+        maxLines,
       )
       setViewportState(viewportForScrollTop(
         target,
@@ -128,18 +120,21 @@ export const TranscriptView: React.FC<TranscriptViewProps> = ({
 
   return (
     <Box flexDirection="column">
-      <Box marginBottom={1}>
-        <Text> </Text>
-      </Box>
       {selection.hiddenBefore > 0 ? (
         <Text color={theme.dim}>
-          {`  ${selection.hiddenBefore} earlier message${selection.hiddenBefore === 1 ? '' : 's'} above this view`}
+          {`  ${selection.hiddenBefore} earlier message${selection.hiddenBefore === 1 ? '' : 's'} above · `}
+          <Text color={theme.accentPeriwinkle}>pgup</Text>
+          {` to scroll · `}
+          <Text color={theme.accentPeriwinkle}>/export</Text>
+          {` saves the full transcript`}
         </Text>
       ) : null}
       <MessageList rows={selection.rows} />
       {selection.hiddenAfter > 0 ? (
         <Text color={theme.dim}>
-          {`  ${selection.hiddenAfter} later message${selection.hiddenAfter === 1 ? '' : 's'} below · pgdn to return`}
+          {`  ${selection.hiddenAfter} later message${selection.hiddenAfter === 1 ? '' : 's'} below · `}
+          <Text color={theme.accentPeriwinkle}>pgdn</Text>
+          {` to return`}
         </Text>
       ) : null}
     </Box>
@@ -179,27 +174,6 @@ function viewportForScrollTop(
   }
 }
 
-function trimSelectionToFocusedTurn(
-  selection: TranscriptWindowSelection<MessageRow>,
-  rows: MessageRow[],
-  state: TranscriptViewportState,
-): TranscriptWindowSelection<MessageRow> {
-  if (state.followTail || state.anchor?.offset !== 0) return selection
-  const focusedIndex = rows.findIndex(row => row.id === state.anchor?.rowId)
-  if (focusedIndex === -1 || rows[focusedIndex]?.role !== 'user') return selection
-  const firstSelected = selection.rows[0]
-  if (!firstSelected || firstSelected.id !== state.anchor.rowId) return selection
-
-  const nextPromptIndex = selection.rows.findIndex((row, index) => index > 0 && row.role === 'user')
-  if (nextPromptIndex === -1) return selection
-
-  return {
-    ...selection,
-    rows: selection.rows.slice(0, nextPromptIndex),
-    hiddenAfter: selection.hiddenAfter + selection.rows.length - nextPromptIndex,
-  }
-}
-
 function sameViewportState(left: TranscriptViewportState, right: TranscriptViewportState): boolean {
   return left.scrollTopLine === right.scrollTopLine
     && left.followTail === right.followTail

package/src/chat/{transcriptViewport.ts → transcript/transcriptViewport.ts}

@@ -1,4 +1,4 @@
-import type { MessageRow } from './MessageList.js'
+import type { MessageRow } from '../MessageList.js'
 
 export type TranscriptAnchor = {
   rowId: string
@@ -141,45 +141,25 @@ export function selectRowsForScrollTop<T>(
   return selectRowsForLineWindow(rows, offsets, budget, startLine, totalLines, maxScrollOffset)
 }
 
-export function promptScrollTopForPageUp(
-  rows: MessageRow[],
-  offsets: number[],
+export function scrollTopForPageUp(
   scrollTopLine: number,
   maxScrollTop: number,
-  followTail: boolean,
+  viewportLines: number,
 ): number {
-  const promptStarts = promptScrollTops(rows, offsets)
-  if (promptStarts.length === 0) return clampLine(scrollTopLine, maxScrollTop)
-  if (followTail) return clampLine(promptStarts[promptStarts.length - 1]!, maxScrollTop)
-
-  const currentLine = clampLine(scrollTopLine, maxScrollTop)
-  for (let index = promptStarts.length - 1; index >= 0; index -= 1) {
-    const line = promptStarts[index]!
-    if (line < currentLine) return clampLine(line, maxScrollTop)
-  }
-  return 0
+  return clampLine(scrollTopLine - pageScrollDistance(viewportLines), maxScrollTop)
 }
 
-export function promptScrollTopForPageDown(
-  rows: MessageRow[],
-  offsets: number[],
+export function scrollTopForPageDown(
   scrollTopLine: number,
   maxScrollTop: number,
+  viewportLines: number,
 ): number {
-  const promptStarts = promptScrollTops(rows, offsets)
-  if (promptStarts.length === 0) return clampLine(scrollTopLine, maxScrollTop)
-
-  const currentLine = clampLine(scrollTopLine, maxScrollTop)
-  const next = promptStarts.find(line => line > currentLine)
-  return next === undefined ? maxScrollTop : clampLine(next, maxScrollTop)
+  return clampLine(scrollTopLine + pageScrollDistance(viewportLines), maxScrollTop)
 }
 
-function promptScrollTops(rows: MessageRow[], offsets: number[]): number[] {
-  const starts: number[] = []
-  for (let index = 0; index < rows.length; index += 1) {
-    if (rows[index]?.role === 'user') starts.push(offsets[index] ?? 0)
-  }
-  return starts
+function pageScrollDistance(viewportLines: number): number {
+  const viewport = Math.max(1, Math.floor(viewportLines))
+  return Math.max(1, Math.floor(viewport / 2))
 }
 
 function selectRowsForLineWindow<T>(
@@ -224,6 +204,8 @@ export function estimateMessageRowHeight(row: MessageRow, columns = 80): number
       return 1 + wrappedLineCount(row.content, contentWidth)
     case 'progress':
       return 4
+    case 'splash':
+      return 28
   }
 }
 

package/src/chat/{ContextLimitView.tsx → views/ContextLimitView.tsx}

@@ -1,8 +1,8 @@
 import React, { useState } from 'react'
 import { Box, Text } from 'ink'
-import type { ContextUsage } from '../runtime/compaction.js'
-import { useAppInput } from '../app/input/AppInputProvider.js'
-import { theme } from '../ui/theme.js'
+import type { ContextUsage } from '../../runtime/compaction.js'
+import { useAppInput } from '../../app/input/AppInputProvider.js'
+import { theme } from '../../ui/theme.js'
 
 export type ContextLimitAction = 'compact' | 'switchModel' | 'send' | 'cancel'
 

package/src/chat/{ContinuityEditReviewView.tsx → views/ContinuityEditReviewView.tsx}

@@ -1,13 +1,15 @@
 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 { Surface } from '../../ui/Surface.js'
+import { Select } from '../../ui/Select.js'
+import { theme } from '../../ui/theme.js'
+import { DiffView } from '../display/DiffView.js'
 
 export type ContinuityEditReviewState = {
   file: 'SOUL.md' | 'MEMORY.md'
   filePath: string
   summary: string
+  diff?: string
   editorOpened?: boolean
 }
 
@@ -23,6 +25,12 @@ export const ContinuityEditReviewView: React.FC<{
     footer="enter select · esc dismiss"
   >
     <Text color={theme.accentPeriwinkle}>{displayContinuityReviewText(review.summary)}</Text>
+    {review.diff ? (
+      <Box flexDirection="column" marginTop={1}>
+        <Text color={theme.accentPeriwinkle}>diff</Text>
+        <DiffView diff={review.diff} />
+      </Box>
+    ) : null}
     <Box marginTop={1}>
       <Select<ContinuityEditReviewAction>
         options={[

package/src/chat/{CopyPicker.tsx → views/CopyPicker.tsx}

@@ -1,8 +1,8 @@
 import React from 'react'
-import { Surface } from '../ui/Surface.js'
-import { Select } from '../ui/Select.js'
-import { parseSegments, type Segment } from '../utils/markdownSegments.js'
-import { copyToClipboard, type CopyResult } from '../utils/clipboard.js'
+import { Surface } from '../../ui/Surface.js'
+import { Select } from '../../ui/Select.js'
+import { parseSegments, type Segment } from '../../utils/markdownSegments.js'
+import { copyToClipboard, type CopyResult } from '../../utils/clipboard.js'
 
 type CopyPickerProps = {
   turnText: string
@@ -48,4 +48,3 @@ export const CopyPicker: React.FC<CopyPickerProps> = ({ turnText, turnLabel, onD
     </Surface>
   )
 }
-

package/src/chat/{PermissionPrompt.tsx → views/PermissionPrompt.tsx}

@@ -1,9 +1,12 @@
 import React, { useMemo } 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 type { PermissionDecision, PermissionRequest } from '../tools/contracts.js'
+import { Surface } from '../../ui/Surface.js'
+import { Select } from '../../ui/Select.js'
+import { theme } from '../../ui/theme.js'
+import { DiffView, diffLineColor } from '../display/DiffView.js'
+import type { PermissionDecision, PermissionRequest } from '../../tools/contracts.js'
+
+export { diffLineColor as permissionDiffLineColor }
 
 type PermissionPromptProps = {
   request: PermissionRequest
@@ -34,7 +37,7 @@ export const PermissionPrompt: React.FC<PermissionPromptProps> = ({ request, onD
           <Box marginTop={1}>
             <Text color={theme.accentPeriwinkle}>diff</Text>
           </Box>
-          <Text color={theme.text}>{request.diff}</Text>
+          <DiffView diff={request.diff} />
         </Box>
       ) : null}
       {request.kind === 'private-continuity-read' ? (
@@ -51,13 +54,9 @@ export const PermissionPrompt: React.FC<PermissionPromptProps> = ({ request, onD
         <Box flexDirection="column" marginBottom={1}>
           <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.accentPeriwinkle}>after</Text>
+            <Text color={theme.accentPeriwinkle}>diff</Text>
           </Box>
-          <Text color={theme.text}>{request.after || '(empty)'}</Text>
+          <DiffView diff={request.diff} />
         </Box>
       ) : null}
       {request.kind === 'bash' && request.warning ? (
@@ -73,20 +72,20 @@ export const PermissionPrompt: React.FC<PermissionPromptProps> = ({ request, onD
 export function permissionOptionsForRequest(request: PermissionRequest): Array<{ value: PermissionDecision; label: string; hint?: string; disabled?: boolean }> {
   if (request.kind === 'bash') {
     return [
-      { value: 'allow-once', label: 'allow once', hint: 'approve only this command execution' },
+      { value: 'allow-once', label: 'Allow Once', hint: 'Approve only this command execution' },
       {
         value: 'allow-command-project',
-        label: 'always allow this exact command',
-        hint: 'remember this command text for this project',
+        label: 'Allow Exact Command',
+        hint: 'Remember this exact command for this project',
         disabled: !request.canPersistExact,
       },
       {
         value: 'allow-command-prefix-project',
-        label: request.commandPrefix ? `always allow ${request.commandPrefix} commands` : 'allow command prefix',
-        hint: 'remember this base command in this working directory for this project',
+        label: request.commandPrefix ? `Allow ${request.commandPrefix} Commands` : 'Allow Command Family',
+        hint: 'Remember this base command in this working directory for this project',
         disabled: !request.canPersistPrefix,
       },
-      { value: 'deny', label: 'deny', hint: 'return a denial back to the model' },
+      { value: 'deny', label: 'Deny', hint: 'Return a denial to the model' },
     ]
   }
 

package/src/chat/{PermissionsView.tsx → views/PermissionsView.tsx}

@@ -1,11 +1,11 @@
 import React, { useEffect, useMemo, useState } from 'react'
 import { Box, Text } from 'ink'
-import { clearPermissionRules, deletePermissionRule, loadPermissionRules } from '../storage/permissions.js'
-import type { SessionPermissionRule } from '../tools/contracts.js'
-import { Select, type SelectOption } from '../ui/Select.js'
-import { Spinner } from '../ui/Spinner.js'
-import { Surface } from '../ui/Surface.js'
-import { theme } from '../ui/theme.js'
+import { clearPermissionRules, deletePermissionRule, loadPermissionRules } from '../../storage/permissions.js'
+import type { SessionPermissionRule } from '../../tools/contracts.js'
+import { Select, type SelectOption } from '../../ui/Select.js'
+import { Spinner } from '../../ui/Spinner.js'
+import { Surface } from '../../ui/Surface.js'
+import { theme } from '../../ui/theme.js'
 
 type PermissionsViewProps = {
   cwd: string

package/src/chat/{PlanApprovalView.tsx → views/PlanApprovalView.tsx}

@@ -1,8 +1,8 @@
 import React, { useState } from 'react'
 import { Box, Text } from 'ink'
-import { Surface } from '../ui/Surface.js'
-import { theme } from '../ui/theme.js'
-import { useAppInput } from '../app/input/AppInputProvider.js'
+import { Surface } from '../../ui/Surface.js'
+import { theme } from '../../ui/theme.js'
+import { useAppInput } from '../../app/input/AppInputProvider.js'
 
 export type PlanApprovalAction = 'apply' | 'apply-summary' | 'continue'
 
@@ -32,7 +32,7 @@ export const PLAN_APPROVAL_OPTIONS: Array<{
     },
     {
       value: 'continue',
-      label: 'No, stay in Plan mode',
+      label: 'No, stay in plan mode',
       title: 'Continue planning with the model.',
       detail: () => 'No files will be changed.',
     },

package/src/chat/{ResumeView.tsx → views/ResumeView.tsx}

@@ -1,11 +1,11 @@
 import React, { useEffect, useState } from 'react'
 import { Box, Text } from 'ink'
-import { theme } from '../ui/theme.js'
-import { Select, type SelectOption } from '../ui/Select.js'
-import { Spinner } from '../ui/Spinner.js'
-import { Surface } from '../ui/Surface.js'
-import { listSessions, type SessionSummary } from '../storage/sessions.js'
-import { useAppInput } from '../app/input/AppInputProvider.js'
+import { theme } from '../../ui/theme.js'
+import { Select, type SelectOption } from '../../ui/Select.js'
+import { Spinner } from '../../ui/Spinner.js'
+import { Surface } from '../../ui/Surface.js'
+import { listSessions, type SessionSummary } from '../../storage/sessions.js'
+import { useAppInput } from '../../app/input/AppInputProvider.js'
 
 type ResumeViewProps = {
   currentSessionId: string
@@ -114,11 +114,11 @@ export const ResumeView: React.FC<ResumeViewProps> = ({ currentSessionId, onResu
   return (
     <Surface
       title="Resume Session"
-      subtitle="Grouped by project, then working directory."
+      subtitle="Grouped by working directory."
       footer="enter resumes · esc closes"
     >
       <Box flexDirection="column" marginBottom={1}>
-        <Text color={theme.dim}>Recent projects</Text>
+        <Text color={theme.dim}>Recent directories</Text>
       </Box>
       <Select
         options={options}
@@ -143,7 +143,7 @@ export function buildResumeOptions(
 ): Array<SelectOption<string>> {
   const groups = new Map<string, SessionSummary[]>()
   for (const session of sessions) {
-    const key = session.projectRoot
+    const key = session.lastCwd || session.workspaceRoot || session.projectRoot
     const existing = groups.get(key) ?? []
     existing.push(session)
     groups.set(key, existing)
@@ -158,36 +158,26 @@ export function buildResumeOptions(
 
   const clearOption: SelectOption<string> = {
     value: CLEAR_ALL_SESSIONS_VALUE,
-    label: 'clear all chat logs',
+    label: 'Clear All Chat Logs',
     hint: 'removes saved chats and resume context',
     role: 'utility',
   }
 
-  const orderedGroups = [...groups.values()].sort((left, right) => right[0]!.mtimeMs - left[0]!.mtimeMs)
+  const orderedGroups = [...groups.entries()].sort(([, left], [, right]) => right[0]!.mtimeMs - left[0]!.mtimeMs)
 
-  for (const group of orderedGroups) {
-    const head = group[0]!
+  for (const [directoryKey, group] of orderedGroups) {
+    const sorted = [...group].sort((left, right) => right.mtimeMs - left.mtimeMs)
+    const sessionCount = sorted.length
+    const lastActivity = formatRelative(sorted[0]!.mtimeMs)
     options.push({
-      value: `header:${head.projectRoot}`,
-      label: head.projectLabel,
-      hint: compressProjectPath(head.projectRoot),
-      disabled: true,
+      value: `directory:${directoryKey}`,
+      label: lastPathSegment(directoryKey) || compressProjectPath(directoryKey),
+      hint: `${compressProjectPath(directoryKey)} · ${sessionCount} session${sessionCount === 1 ? '' : 's'} · last ${lastActivity}`,
+      role: 'section',
+      bold: true,
     })
 
-    const byDirectory = [...group].sort((left, right) => right.mtimeMs - left.mtimeMs)
-    let lastDirectoryLabel: string | null = null
-
-    for (const session of byDirectory) {
-      if (session.directoryLabel !== lastDirectoryLabel) {
-        lastDirectoryLabel = session.directoryLabel
-        options.push({
-          value: `directory:${head.projectRoot}:${session.directoryLabel}`,
-          label: `in ${formatDirectoryDisplay(session.directoryLabel)}`,
-          hint: undefined,
-          disabled: true,
-        })
-      }
-
+    for (const session of sorted) {
       const baseLabel = formatFirstLine(session.firstUserMessage) || '(empty session)'
       const markers = [
         session.id === currentSessionId ? 'current' : '',
@@ -206,6 +196,7 @@ export function buildResumeOptions(
         value: session.id,
         label,
         hint: hintParts.join(' · '),
+        indent: 2,
       })
     }
   }
@@ -219,7 +210,15 @@ export function buildResumeOptions(
 function findInitialIndex(options: Array<SelectOption<string>>, currentSessionId: string): number {
   const currentIndex = options.findIndex(option => option.value === currentSessionId)
   if (currentIndex >= 0) return currentIndex
-  return Math.max(0, options.findIndex(option => !option.disabled && option.value !== CLEAR_ALL_SESSIONS_VALUE))
+  return Math.max(
+    0,
+    options.findIndex(option =>
+      !option.disabled
+      && option.role !== 'section'
+      && option.role !== 'group'
+      && option.value !== CLEAR_ALL_SESSIONS_VALUE,
+    ),
+  )
 }
 
 async function clearAll(
@@ -240,9 +239,10 @@ function compressProjectPath(input: string): string {
   return home && input.startsWith(home) ? `~${input.slice(home.length)}` : input
 }
 
-function formatDirectoryDisplay(input: string): string {
-  if (input === '.' || input === '') return './'
-  return input.startsWith('./') ? input : `./${input}`
+function lastPathSegment(input: string): string {
+  const trimmed = input.replace(/[\\/]+$/, '')
+  const slash = Math.max(trimmed.lastIndexOf('/'), trimmed.lastIndexOf('\\'))
+  return slash >= 0 ? trimmed.slice(slash + 1) : trimmed
 }
 
 function formatFirstLine(text: string): string {