ethagent 2.3.0 → 3.0.0

package/src/chat/transcript/transcriptViewport.ts

@@ -1,4 +1,5 @@
 import type { MessageRow } from '../MessageList.js'
+import { flattenAssistantBody } from '../MessageList.js'
 
 export type TranscriptAnchor = {
   rowId: string
@@ -11,6 +12,13 @@ export type TranscriptViewportState = {
   anchor: TranscriptAnchor | null
 }
 
+export type RowSlice<T> = {
+  row: T
+  clipStart: number
+  clipEnd: number
+  rowHeight: number
+}
+
 export function buildLineOffsets(rowHeights: number[]): number[] {
   const out = new Array<number>(rowHeights.length + 1).fill(0)
   for (let i = 0; i < rowHeights.length; i += 1) {
@@ -62,12 +70,12 @@ export function clampLine(line: number, maxScrollTop: number): number {
 }
 
 export type TranscriptTailSelection<T> = {
-  rows: T[]
+  rows: Array<RowSlice<T>>
   hiddenCount: number
 }
 
 export type TranscriptWindowSelection<T> = {
-  rows: T[]
+  rows: Array<RowSlice<T>>
   hiddenBefore: number
   hiddenAfter: number
   totalLines: number
@@ -94,8 +102,12 @@ export function selectTailRowsForViewport<T>(
   }
 
   const firstVisible = Math.max(0, start + 1)
+  const slice = rows.slice(firstVisible).map(row => {
+    const height = Math.max(1, estimateHeight(row))
+    return { row, clipStart: 0, clipEnd: height, rowHeight: height }
+  })
   return {
-    rows: rows.slice(firstVisible),
+    rows: slice,
     hiddenCount: firstVisible,
   }
 }
@@ -118,7 +130,7 @@ export function selectRowsForScrollOffset<T>(
   const scrollOffset = clampLine(scrollOffsetFromTail, maxScrollOffset)
   const startLine = Math.max(0, totalLines - budget - scrollOffset)
 
-  return selectRowsForLineWindow(rows, offsets, budget, startLine, totalLines, maxScrollOffset)
+  return selectRowsForLineWindow(rows, heights, offsets, budget, startLine, totalLines, maxScrollOffset)
 }
 
 export function selectRowsForScrollTop<T>(
@@ -138,7 +150,7 @@ export function selectRowsForScrollTop<T>(
   const maxScrollOffset = Math.max(0, totalLines - budget)
   const startLine = clampLine(scrollTopLine, maxScrollOffset)
 
-  return selectRowsForLineWindow(rows, offsets, budget, startLine, totalLines, maxScrollOffset)
+  return selectRowsForLineWindow(rows, heights, offsets, budget, startLine, totalLines, maxScrollOffset)
 }
 
 export function scrollTopForPageUp(
@@ -159,11 +171,12 @@ export function scrollTopForPageDown(
 
 function pageScrollDistance(viewportLines: number): number {
   const viewport = Math.max(1, Math.floor(viewportLines))
-  return Math.max(1, Math.floor(viewport / 2))
+  return Math.max(1, viewport - 2)
 }
 
 function selectRowsForLineWindow<T>(
   rows: T[],
+  heights: number[],
   offsets: number[],
   budget: number,
   startLine: number,
@@ -178,8 +191,20 @@ function selectRowsForLineWindow<T>(
     ? rows.length
     : Math.min(rows.length, findRowIndexAtLine(offsets, lastVisibleLine) + 1)
 
+  const slices: Array<RowSlice<T>> = []
+  for (let i = startIndex; i < endIndex; i += 1) {
+    const row = rows[i]
+    if (!row) continue
+    const rowTop = offsets[i] ?? 0
+    const height = heights[i] ?? 1
+    const clipStart = Math.max(0, startLine - rowTop)
+    const clipEnd = Math.min(height, endLine - rowTop)
+    if (clipEnd <= clipStart) continue
+    slices.push({ row, clipStart, clipEnd, rowHeight: height })
+  }
+
   return {
-    rows: rows.slice(startIndex, endIndex),
+    rows: slices,
     hiddenBefore: startIndex,
     hiddenAfter: rows.length - endIndex,
     totalLines,
@@ -191,13 +216,11 @@ export function estimateMessageRowHeight(row: MessageRow, columns = 80): number
   const contentWidth = Math.max(20, columns - 8)
   switch (row.role) {
     case 'user':
-      return 1 + wrappedLineCount(row.content, contentWidth)
+      return userRowLineCount(row.content, contentWidth)
     case 'assistant':
-      return 1 + wrappedLineCount([row.content, row.liveTail ?? ''].filter(Boolean).join('\n'), contentWidth)
+      return assistantRowLineCount(row.content, row.liveTail ?? '', contentWidth, Boolean(row.streaming))
     case 'thinking':
-      return row.expanded
-        ? 3 + wrappedLineCount([row.content, row.liveTail ?? ''].filter(Boolean).join('\n'), contentWidth)
-        : 3 + wrappedLineCount(reasoningPreview(row), contentWidth)
+      return thinkingRowLineCount(row, contentWidth)
     case 'tool_call':
       return 1
     case 'note':
@@ -209,11 +232,59 @@ export function estimateMessageRowHeight(row: MessageRow, columns = 80): number
   }
 }
 
-function reasoningPreview(row: Extract<MessageRow, { role: 'thinking' }>): string {
-  const normalized = [row.content, row.liveTail ?? ''].filter(Boolean).join('').replace(/\s+/g, ' ').trim()
-  if (!normalized) return 'thinking...'
-  if (normalized.length <= 120) return normalized
-  return `${normalized.slice(0, 117)}...`
+export function userRowLineCount(content: string, contentWidth: number): number {
+  const lines = splitLines(content)
+  return 1 + lines.reduce((sum, line) => sum + Math.max(1, Math.ceil(line.length / contentWidth)), 0)
+}
+
+export function assistantRowLineCount(content: string, liveTail: string, _contentWidth: number, streaming = false): number {
+  const fullText = liveTail ? content + liveTail : content
+  return 1 + flattenAssistantBody(fullText, streaming).length
+}
+
+export function thinkingRowLineCount(
+  row: Extract<MessageRow, { role: 'thinking' }>,
+  _contentWidth: number,
+): number {
+  const omitted = thinkingDisplayOmittedChars(row)
+  const overhead = 1 + (omitted > 0 ? 1 : 0) + 1
+  if (!row.expanded) return overhead
+  const body = thinkingDisplayBody(row)
+  const lines = splitLines(body)
+  return overhead + lines.length
+}
+
+export function thinkingDisplayBody(row: Extract<MessageRow, { role: 'thinking' }>): string {
+  const text = row.liveTail ? row.content + row.liveTail : row.content
+  return clipReasoningForDisplayText(text)
+}
+
+export function thinkingDisplayOmittedChars(row: Extract<MessageRow, { role: 'thinking' }>): number {
+  const text = row.liveTail ? row.content + row.liveTail : row.content
+  return clipReasoningForDisplayOmitted(text)
+}
+
+const MAX_RENDERED_REASONING_CHARS = 10_000
+
+function clipReasoningForDisplayText(text: string): string {
+  if (text.length <= MAX_RENDERED_REASONING_CHARS) return text
+  const rawStart = Math.max(0, text.length - MAX_RENDERED_REASONING_CHARS)
+  const newline = text.indexOf('\n', rawStart)
+  const start = newline >= 0 && newline - rawStart <= 240 ? newline + 1 : rawStart
+  return text.slice(start)
+}
+
+function clipReasoningForDisplayOmitted(text: string): number {
+  if (text.length <= MAX_RENDERED_REASONING_CHARS) return 0
+  const rawStart = Math.max(0, text.length - MAX_RENDERED_REASONING_CHARS)
+  const newline = text.indexOf('\n', rawStart)
+  return newline >= 0 && newline - rawStart <= 240 ? newline + 1 : rawStart
+}
+
+export function splitLines(text: string): string[] {
+  if (!text) return ['']
+  const normalized = text.replace(/\r\n/g, '\n').replace(/\r/g, '\n')
+  return normalized.split('\n')
 }
 
 function wrappedLineCount(text: string, width: number): number {

package/src/chat/views/PermissionPrompt.tsx

@@ -72,16 +72,16 @@ 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: 'Allow Exact Command',
+        label: 'Allow exact command',
         hint: 'Remember this exact command for this project',
         disabled: !request.canPersistExact,
       },
       {
         value: 'allow-command-prefix-project',
-        label: request.commandPrefix ? `Allow ${request.commandPrefix} Commands` : 'Allow Command Family',
+        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,
       },
@@ -91,63 +91,63 @@ export function permissionOptionsForRequest(request: PermissionRequest): Array<{
 
   if (request.kind === 'mcp') {
     const risk = request.destructive
-      ? 'server marks this tool as destructive'
+      ? 'Server marks this tool as destructive'
       : request.openWorld
-        ? 'server marks this tool as open-world'
+        ? 'Server marks this tool as open-world'
         : request.readOnly
-          ? 'server marks this tool as read-only'
-          : 'server did not mark this tool read-only'
+          ? 'Server marks this tool as read-only'
+          : 'Server did not mark this tool read-only'
     return [
-      { value: 'allow-once', label: 'allow once', hint: risk },
-      { value: 'allow-mcp-tool-project', label: 'always allow this MCP tool', hint: request.toolKey },
+      { value: 'allow-once', label: 'Allow once', hint: risk },
+      { value: 'allow-mcp-tool-project', label: 'Always allow this MCP tool', hint: request.toolKey },
       {
         value: 'allow-mcp-server-project',
-        label: `always allow ${request.serverName}`,
-        hint: 'remember all tools from this MCP server for this project',
+        label: `Always allow ${request.serverName}`,
+        hint: 'Remember all tools from this MCP server for this project',
         disabled: !request.canPersistServer,
       },
-      { value: 'deny', label: 'deny', hint: 'return a denial back to the model' },
+      { value: 'deny', label: 'Deny', hint: 'Return a denial back to the model' },
     ]
   }
 
   if (request.kind === 'delete') {
     return [
-      { value: 'allow-once', label: 'delete this file', hint: 'approve this deletion only' },
-      { value: 'deny', label: 'deny', hint: 'keep the file unchanged' },
+      { value: 'allow-once', label: 'Delete this file', hint: 'Approve this deletion only' },
+      { value: 'deny', label: 'Deny', hint: 'Keep the file unchanged' },
     ]
   }
 
   if (request.kind === 'private-continuity-read') {
     return [
-      { value: 'allow-once', label: 'allow once', hint: `read ${request.file}` },
-      { value: 'deny', label: 'deny', hint: 'keep private continuity hidden' },
+      { value: 'allow-once', label: 'Allow once', hint: `Read ${request.file}` },
+      { value: 'deny', label: 'Deny', hint: 'Keep private continuity hidden' },
     ]
   }
 
   if (request.kind === 'private-continuity-edit') {
     return [
-      { value: 'allow-once', label: 'Approve Once', hint: `Apply this edit to ${request.file}` },
+      { value: 'allow-once', label: 'Approve once', hint: `Apply this edit to ${request.file}` },
       { value: 'deny', label: 'Deny', hint: 'Keep private continuity unchanged' },
     ]
   }
 
   return [
-    { value: 'allow-once', label: 'allow once', hint: 'approve only this action' },
-    { value: 'allow-path-project', label: 'always allow this file', hint: request.relativePath },
-    { value: 'allow-directory-project', label: 'always allow this folder', hint: request.directoryPath },
+    { value: 'allow-once', label: 'Allow once', hint: 'Approve only this action' },
+    { value: 'allow-path-project', label: 'Always allow this file', hint: request.relativePath },
+    { value: 'allow-directory-project', label: 'Always allow this folder', hint: request.directoryPath },
     {
       value: 'allow-kind-project',
       label:
         request.kind === 'edit'
-          ? 'always allow edits'
+          ? 'Always allow edits'
           : request.kind === 'write'
-            ? 'always allow writes'
+            ? 'Always allow writes'
           : request.kind === 'cd'
-            ? 'always allow directory changes'
-            : 'always allow reads',
-      hint: 'remember this tool kind for this project',
+            ? 'Always allow directory changes'
+            : 'Always allow reads',
+      hint: 'Remember this tool kind for this project',
     },
-    { value: 'deny', label: 'deny', hint: 'return a denial back to the model' },
+    { value: 'deny', label: 'Deny', hint: 'Return a denial back to the model' },
   ]
 }
 

package/src/chat/views/PermissionsView.tsx

@@ -118,18 +118,24 @@ export const PermissionsView: React.FC<PermissionsViewProps> = ({
 }
 
 function buildOptions(rules: SessionPermissionRule[]): Array<SelectOption<SessionPermissionRule | typeof CLEAR_ALL_VALUE>> {
-  return [
-    ...rules.map(rule => ({
-      value: rule,
-      label: describeRule(rule),
-      hint: describeRuleScope(rule),
-    })),
-    {
-      value: CLEAR_ALL_VALUE,
-      label: 'Remove all saved rules',
-      hint: 'Clear all remembered permissions for this project',
-    },
-  ]
+  const out: Array<SelectOption<SessionPermissionRule | typeof CLEAR_ALL_VALUE>> = []
+  if (rules.length > 0) {
+    out.push({ value: CLEAR_ALL_VALUE, role: 'section', label: 'Saved Rules' })
+    for (const rule of rules) {
+      out.push({
+        value: rule,
+        label: describeRule(rule),
+        hint: describeRuleScope(rule),
+      })
+    }
+  }
+  out.push({ value: CLEAR_ALL_VALUE, role: 'section', label: 'Manage' })
+  out.push({
+    value: CLEAR_ALL_VALUE,
+    label: 'Remove all saved rules',
+    hint: 'Clear all remembered permissions for this project',
+  })
+  return out
 }
 
 function describeRule(rule: SessionPermissionRule): string {

package/src/chat/views/ResumeView.tsx

@@ -48,8 +48,8 @@ export const ResumeView: React.FC<ResumeViewProps> = ({ currentSessionId, onResu
 
   if (state.kind === 'loading') {
     return (
-      <Surface title="Resume Session" subtitle="Loading projects and directories...">
-        <Spinner label="loading sessions..." />
+      <Surface title="Resume Session" subtitle="Recent chats and directories." footer="esc closes">
+        <Spinner label="loading..." />
       </Surface>
     )
   }
@@ -65,7 +65,7 @@ export const ResumeView: React.FC<ResumeViewProps> = ({ currentSessionId, onResu
   if (state.kind === 'confirmClear') {
     return (
       <Surface
-        title="Clear All Chat Logs?"
+        title="Clear All Saved Sessions?"
         subtitle={`${state.sessions.length} saved session${state.sessions.length === 1 ? '' : 's'} will be removed.`}
         tone="error"
         footer="enter selects · esc returns to resume"
@@ -76,9 +76,10 @@ export const ResumeView: React.FC<ResumeViewProps> = ({ currentSessionId, onResu
           {state.error ? <Text color={theme.accentError}>{state.error}</Text> : null}
         </Box>
         <Select<'back' | 'clear'>
+          hintLayout="inline"
           options={[
-            { value: 'back', label: 'back to sessions' },
-            { value: 'clear', label: 'clear all chat logs', hint: 'cannot be undone' },
+            { value: 'back', label: 'Back to Sessions' },
+            { value: 'clear', label: 'Clear All Saved Sessions', hint: 'Cannot be undone' },
           ]}
           onSubmit={choice => {
             if (choice === 'back') {
@@ -155,11 +156,18 @@ export function buildResumeOptions(
     label: '',
     disabled: true,
   }
+  const manageHeader: SelectOption<string> = {
+    value: 'separator:manage',
+    label: 'Manage',
+    role: 'section',
+    bold: true,
+    disabled: true,
+  }
 
   const clearOption: SelectOption<string> = {
     value: CLEAR_ALL_SESSIONS_VALUE,
-    label: 'Clear All Chat Logs',
-    hint: 'removes saved chats and resume context',
+    label: 'Clear All Saved Sessions',
+    hint: 'Removes saved chats and resume context',
     role: 'utility',
   }
 
@@ -202,6 +210,7 @@ export function buildResumeOptions(
   }
 
   options.push(manageSpacer)
+  options.push(manageHeader)
   options.push(clearOption)
 
   return options

package/src/chat/views/RewindView.tsx

@@ -142,11 +142,13 @@ export const RewindView: React.FC<RewindViewProps> = ({
     const canRestoreCode = selectedRow.entries.length > 0
 
     const actionOptions: Array<SelectOption<ConfirmOption>> = [
+      { value: 'both', role: 'section', label: 'Restore' },
       { value: 'both', prefix: '1.', label: 'Restore code and conversation', disabled: !canRestoreCode },
       { value: 'conversation', prefix: '2.', label: 'Restore conversation' },
       { value: 'code', prefix: '3.', label: 'Restore code', disabled: !canRestoreCode },
       { value: 'summarize', prefix: '4.', label: 'Summarize from here' },
-      { value: 'nevermind', prefix: '5.', label: 'Never mind' },
+      { value: 'nevermind', role: 'section', label: 'Navigation' },
+      { value: 'nevermind', prefix: '5.', label: 'Never mind', role: 'utility' },
     ]
     const defaultValue: ConfirmOption = canRestoreCode ? 'both' : 'conversation'
     const initialIndex = actionOptions.findIndex(option => option.value === defaultValue && !option.disabled)

package/src/cli/ResetConfirmView.tsx

@@ -5,6 +5,8 @@ import { Select } from '../ui/Select.js'
 import { theme } from '../ui/theme.js'
 import type { FactoryResetPlan } from '../storage/factoryReset.js'
 
+type SectionTone = 'destructive' | 'safe' | 'untouched'
+
 export const ResetConfirmView: React.FC<{
   plan: FactoryResetPlan
   onDone: (confirmed: boolean) => void
@@ -16,17 +18,22 @@ export const ResetConfirmView: React.FC<{
   }
 
   return (
-    <Surface title="Reset Local Data?" subtitle="Deletes this machine's ethagent data. Models and onchain records stay." footer="enter select · esc cancel">
+    <Surface
+      title="Reset Local Data?"
+      subtitle="Deletes this machine's ethagent data. Models and onchain records stay."
+      footer="enter select · esc cancel"
+      tone="error"
+    >
       <Box flexDirection="column">
-        <Section title="Deletes" lines={[
+        <Section tone="destructive" title="Deletes" lines={[
           'Identity files, sessions, history, credentials',
           localDataLine(plan.deletePaths.length),
         ]} />
-        <Section title="Keeps" lines={[
+        <Section tone="safe" title="Keeps" lines={[
           'Local GGUF models and llama.cpp runners',
           ...(plan.preservedPaths.length > 0 ? [`${plan.preservedPaths.length} local model path${plan.preservedPaths.length === 1 ? '' : 's'}`] : ['No local model assets found']),
         ]} />
-        <Section title="Not Touched" lines={[
+        <Section tone="untouched" title="Not Touched" lines={[
           'ERC-8004 tokens and onchain records',
           'IPFS snapshots and public metadata',
         ]} />
@@ -34,9 +41,11 @@ export const ResetConfirmView: React.FC<{
       <Box marginTop={1}>
         <Select<'confirm' | 'cancel'>
           options={[
-            { value: 'confirm', label: 'Reset Local Data', hint: 'Delete local ethagent data now' },
-            { value: 'cancel', label: 'Cancel', hint: 'Leave local data unchanged' },
+            { value: 'confirm', label: 'Yes, reset local data', hint: 'Delete local ethagent data on this machine', bold: true },
+            { value: 'cancel', label: 'No, cancel', hint: 'Leave local data unchanged', role: 'utility' },
           ]}
+          hintLayout="inline"
+          initialIndex={1}
           onSubmit={choice => finish(choice === 'confirm')}
           onCancel={() => finish(false)}
         />
@@ -45,15 +54,21 @@ export const ResetConfirmView: React.FC<{
   )
 }
 
-const Section: React.FC<{ title: string; lines: string[] }> = ({ title, lines }) => (
+const Section: React.FC<{ tone: SectionTone; title: string; lines: string[] }> = ({ tone, title, lines }) => (
   <Box flexDirection="column" marginBottom={1}>
-    <Text color={theme.accentPeriwinkle}>{title}</Text>
+    <Text color={sectionTitleColor(tone)}>{title}</Text>
     {lines.map(line => (
-      <Text key={line} color={theme.textSubtle}>- {line}</Text>
+      <Text key={line} color={theme.textSubtle}>· {line}</Text>
     ))}
   </Box>
 )
 
+function sectionTitleColor(tone: SectionTone): string {
+  if (tone === 'destructive') return theme.accentError
+  if (tone === 'safe') return theme.accentPeriwinkle
+  return theme.dim
+}
+
 function localDataLine(count: number): string {
   if (count === 0) return 'No local ethagent data found'
   return `${count} local path${count === 1 ? '' : 's'} under ~/.ethagent`

package/src/identity/continuity/editor.ts

@@ -12,9 +12,20 @@ type EditorCommand = {
   shell?: boolean
 }
 
-export function openFileInEditor(file: string): Promise<EditorOpenResult> {
+export async function openFileInEditor(file: string): Promise<EditorOpenResult> {
+  if (isVscodeEnvironment()) {
+    const vscode = vscodeEditorCommand(file)
+    const result = await openEditorCommand(vscode)
+    if (result.ok) return result
+  }
   const command = defaultEditorCommand(file)
-  if (!command) return Promise.resolve({ ok: false, error: 'no default open command for this platform' })
+  if (!command) return { ok: false, error: 'no default open command for this platform' }
+  return openEditorCommand(command)
+}
+
+export async function openInFileManager(target: string): Promise<EditorOpenResult> {
+  const command = defaultEditorCommand(target)
+  if (!command) return { ok: false, error: 'no default open command for this platform' }
   return openEditorCommand(command)
 }
 
@@ -47,3 +58,17 @@ export function defaultEditorCommand(file: string, platform: NodeJS.Platform = p
   if (platform === 'darwin') return { cmd: 'open', args: [file], method: 'open', waited: false }
   return { cmd: 'xdg-open', args: [file], method: 'xdg-open', waited: false }
 }
+
+export function isVscodeEnvironment(env: NodeJS.ProcessEnv = process.env): boolean {
+  if (env.TERM_PROGRAM === 'vscode') return true
+  if (env.VSCODE_PID) return true
+  if (env.VSCODE_GIT_IPC_HANDLE) return true
+  return false
+}
+
+export function vscodeEditorCommand(file: string, platform: NodeJS.Platform = process.platform): EditorCommand {
+  if (platform === 'win32') {
+    return { cmd: 'cmd', args: ['/c', 'code', '--reuse-window', file], method: 'vscode', waited: false }
+  }
+  return { cmd: 'code', args: ['--reuse-window', file], method: 'vscode', waited: false }
+}