ethagent 2.2.0 → 2.3.0

package/src/models/ModelPicker.tsx

@@ -612,9 +612,11 @@ export const ModelPicker: React.FC<ModelPickerProps> = ({
         ) : (
           <Select
             options={[
-              { value: 'signin', label: 'Sign in Again' },
-              { value: 'signout', label: 'Sign Out' },
-              { value: 'cancel', label: 'Back' },
+              { value: 'hdr:account', label: 'Account', disabled: true, role: 'section', bold: true },
+              { value: 'signin', label: 'Sign in Again', indent: 2 },
+              { value: 'signout', label: 'Sign Out', indent: 2 },
+              { value: 'hdr:nav', label: 'Navigation', disabled: true, role: 'section', bold: true },
+              { value: 'cancel', label: 'Back', indent: 2 },
             ]}
             onSubmit={(value) => {
               if (value === 'signin') {

package/src/models/catalog.ts

@@ -2,6 +2,7 @@ import { defaultModelFor, type EthagentConfig, type ProviderId } from '../storag
 import { getKey } from '../storage/secrets.js'
 import { loadLocalHfModels } from './huggingface.js'
 import { hasOpenAIOAuthCredentials } from '../auth/openaiOAuth/credentials.js'
+import { providerDisplayName } from './providerDisplay.js'
 
 const OPENAI_OAUTH_MODEL_IDS = ['gpt-5.5', 'gpt-5.4', 'gpt-5.4-mini', 'gpt-5.3-codex', 'gpt-5.2'] as const
 
@@ -85,7 +86,7 @@ export async function discoverProviderModels(
     if (provider === 'openai' && await hasOpenAIOAuthCredentials()) {
       return openAIOAuthCatalog()
     }
-    return fallbackResult(config, `missing ${provider} API key`)
+    return fallbackResult(config, `missing ${providerDisplayName(provider)} API key`)
   }
 
   const baseUrl = provider === 'openai' ? openAIBaseUrlFor(config) : ''

package/src/models/modelPickerOptions.ts

@@ -7,26 +7,14 @@ import { type SelectOption } from '../ui/Select.js'
 import { formatLocalHfModelDisplayName, formatModelDisplayName } from './modelDisplay.js'
 import { localModelId, quantizationFromFilename } from './huggingface.js'
 import type { UncensoredCatalogEntry } from './uncensoredCatalog.js'
+import { cloudProviderDisplayName, providerDisplayName, type CloudProviderId } from './providerDisplay.js'
 
-export type CloudProviderId = Exclude<ProviderId, 'llamacpp'>
+export { cloudProviderDisplayName, providerDisplayName, type CloudProviderId }
 
 export const MODEL_PICKER_CLOUD_PROVIDERS: CloudProviderId[] = ['openai', 'anthropic', 'gemini']
 export const LOCAL_MODEL_LINK_HINT = 'Paste a GGUF link'
 export const LOCAL_MODEL_LINK_EXAMPLE = 'e.g. https://huggingface.co/Qwen/Qwen3-8B-GGUF'
 
-export function cloudProviderDisplayName(provider: CloudProviderId): string {
-  switch (provider) {
-    case 'openai': return 'OpenAI'
-    case 'anthropic': return 'Anthropic'
-    case 'gemini': return 'Gemini'
-  }
-}
-
-export function providerDisplayName(provider: ProviderId): string {
-  if (provider === 'llamacpp') return 'llama.cpp'
-  return cloudProviderDisplayName(provider)
-}
-
 export type LocalHfPickerModel = {
   id: string
   displayName: string

package/src/models/providerDisplay.ts

@@ -0,0 +1,16 @@
+import type { ProviderId } from '../storage/config.js'
+
+export type CloudProviderId = Exclude<ProviderId, 'llamacpp'>
+
+export function cloudProviderDisplayName(provider: CloudProviderId): string {
+  switch (provider) {
+    case 'openai': return 'OpenAI'
+    case 'anthropic': return 'Anthropic'
+    case 'gemini': return 'Gemini'
+  }
+}
+
+export function providerDisplayName(provider: ProviderId): string {
+  if (provider === 'llamacpp') return 'llama.cpp'
+  return cloudProviderDisplayName(provider)
+}

package/src/providers/errors.ts

@@ -1,6 +1,7 @@
 import type { ProviderId } from '../storage/config.js'
 import { ProviderError } from './contracts.js'
 import { formatGeminiRateLimitMessage } from './gemini.js'
+import { providerDisplayName } from '../models/providerDisplay.js'
 
 type ErrorBody =
   | string
@@ -30,19 +31,20 @@ export async function providerErrorFromResponse(
     && /API[_ ]?key( not valid| not found|_invalid)|invalid api key/i.test(detail)
   ) {
     return new ProviderError(
-      'gemini: API key rejected — verify your key at https://aistudio.google.com/app/apikey, then run /key gemini to set it again',
+      'Gemini: API key rejected — verify your key at https://aistudio.google.com/app/apikey, then run /key gemini to set it again',
     )
   }
 
   if (provider !== 'llamacpp') {
+    const name = providerDisplayName(provider)
     if (response.status === 401 || response.status === 403) {
-      return new ProviderError(`auth failed: check your ${provider} key (/doctor to verify)`)
+      return new ProviderError(`auth failed: check your ${name} key (/doctor to verify)`)
     }
     if (response.status === 429) {
-      return new ProviderError(detail || `${provider} rate limit exceeded`, { transient: true })
+      return new ProviderError(detail || `${name} rate limit exceeded`, { transient: true })
     }
     if (response.status >= 500) {
-      return new ProviderError(detail || `${provider} server error (${response.status})`, { transient: true })
+      return new ProviderError(detail || `${name} server error (${response.status})`, { transient: true })
     }
   }
 

package/src/providers/openai-chat.ts

@@ -5,6 +5,7 @@ import { providerErrorFromResponse } from './errors.js'
 import { fetchWithRetryStreamEvents } from './retry.js'
 import { iterSseFrames } from './sse.js'
 import { messageTextContent } from '../utils/messages.js'
+import { providerDisplayName } from '../models/providerDisplay.js'
 
 export type OpenAIToolDefinition = {
   type: 'function'
@@ -369,7 +370,7 @@ function providerNetworkErrorMessage(
 ): string {
   const message = (err as Error).message || fallback
   if (provider !== 'llamacpp') return message
-  return `${provider} request failed at ${baseUrl}: ${message}`
+  return `${providerDisplayName(provider)} request failed at ${baseUrl}: ${message}`
 }
 
 class ContentThinkingParser {

package/src/runtime/sessionMode.ts

@@ -24,7 +24,7 @@ export function nextSessionMode(mode: SessionMode): SessionMode {
 }
 
 export function sessionModeLabel(mode: SessionMode): string {
-  return mode === 'plan' ? 'Plan mode' : mode === 'accept-edits' ? 'Accept edits on' : ''
+  return mode === 'plan' ? 'plan mode' : mode === 'accept-edits' ? 'accept edits on' : ''
 }
 
 export function modePolicy(mode: PolicyMode): ModePolicy {

package/src/runtime/systemPrompt.ts

@@ -76,7 +76,7 @@ function buildToolEnabledPrompt(ctx: SystemPromptContext): string {
         '**DIRECT REQUESTS**: If the user asks to change directory, list files, or read a file, respond with exactly one matching native tool call. Do not substitute prose or claim the action was taken.',
         '**EVIDENCE REQUIRED**: Do not claim a path is missing, a directory does not exist, or a file is absent unless you have a `list_directory` or `read_file` result from this conversation that confirms it.',
         '**TOOL TYPING**: Tool names are NOT shell commands. NEVER pass `list_directory`, `read_file`, `edit_file`, or `change_directory` directly to `run_bash`. Call the matching native tool.',
-        'Prefer targeted `read_file` and `edit_file` calls over general `run_bash` operations when both solve the task.',
+        '**PREFER NATIVE TOOLS**: If a request can be answered by `list_directory`, `read_file`, `edit_file`, `write_file`, `delete_file`, or `change_directory`, use that tool. Treat reaching for `run_bash` as a flag that you may be doing it wrong — only proceed if the action genuinely needs a real shell.',
         ...(ctx.mode === 'plan'
           ? [
               'Only read/list tools and permission-gated private continuity reads are available in plan mode.',
@@ -99,6 +99,8 @@ function buildToolEnabledPrompt(ctx: SystemPromptContext): string {
                   ]
                 : ['No agent identity is linked in this session. Do not attempt private identity continuity edits; ask the user to create or load an agent first.']),
               'Use `run_bash` **only** when true shell execution is necessary.',
+              '**NO BASH EXPLORATION**: Never use `run_bash` to inspect the workspace. That means no `node -e`, no heredocs (`<<EOF`, `<<\'NODE\'`), no `find`, `grep`, `cat`, `head`, `tail`, `ls`, `dir`, `type`, `tree`, or shell loops to read or walk files. Use `list_directory` for directories and `read_file` for files. `run_bash` is reserved for actions that require a real shell: running tests, builds, git operations, launching processes. If you catch yourself writing a one-liner to read or list something, stop and call the native tool instead.',
+              '**DISCOVERY BUDGET**: For exploratory or "tell me about" questions, target ≤5 tool calls total. If 5 calls of the same kind have not given you enough to answer, the question does not need more depth — answer from what you have. Do not recursively scan, walk every subdirectory, or write deeper scripts to be more thorough than the user asked for. Stop and reply.',
               'Never use `run_bash` to produce conversational text. Do not call `echo`, `printf`, or similar to emit your reply — write it as your assistant text. Bash is for actions that need a real shell, not for generating words.',
               '**CWD CONTINUITY**: The working directory below is authoritative. After `change_directory` succeeds, use the new path as the base for subsequent actions.',
               'Do not lag behind the CWD. Edit/read relative to the *current* working directory.',

package/src/runtime/toolExecution.ts

@@ -17,10 +17,7 @@ import type {
 import { setCwd as setRuntimeCwd } from './cwd.js'
 import type { EthagentConfig } from '../storage/config.js'
 import type { SessionMessage } from '../storage/sessions.js'
-import {
-  summarizeToolInput,
-  toolResultContentForRow,
-} from '../chat/chatScreenUtils.js'
+import { toolResultContentForRow, toolResultDiffForRow } from '../chat/chatScreenUtils.js'
 import type { MessageRow } from '../chat/MessageList.js'
 import { modePolicy, toPermissionMode, type SessionMode } from './sessionMode.js'
 
@@ -239,7 +236,7 @@ export async function runPendingToolUses(args: {
         id: rowId,
         name: toolUse.name,
         summary: toolUse.name,
-        input: summarizeToolInput(toolUse.input),
+        input: toolUse.input,
       },
     ])
     await args.persistTurnMessage({
@@ -282,9 +279,15 @@ async function recordToolResult(
 ): Promise<void> {
   const isError = !result.ok
   const resultContent = toolResultContentForRow(toolUse.name, result.content, isError)
+  const diff = toolResultDiffForRow(result.content, isError)
   args.updateRows(prev => prev.map(row =>
     row.role === 'tool_call' && row.id === rowId
-      ? { ...row, result: { content: resultContent, summary: result.summary, isError } }
+      ? {
+          ...row,
+          result: diff
+            ? { content: resultContent, summary: result.summary, isError, diff }
+            : { content: resultContent, summary: result.summary, isError },
+        }
       : row,
   ))
   await args.persistTurnMessage({

package/src/runtime/turn.ts

@@ -56,6 +56,7 @@ function normalize(event: StreamEvent): ProviderTurnEvent {
 }
 
 export const MAX_CONTINUATION_NUDGES = 3
+export const MAX_TOOL_USES_PER_TURN = 25
 
 export type ContinuationNudgeReason =
   | 'continuation'
@@ -63,6 +64,7 @@ export type ContinuationNudgeReason =
   | 'tool_state_claim'
   | 'tool_protocol_fake'
   | 'tool_delegation'
+  | 'tool_budget'
   | 'private_continuity_tool'
   | 'private_continuity_tool_repair'
   | 'reasoning_only'
@@ -82,6 +84,9 @@ const TOOL_PROTOCOL_FAKE_NUDGE_TEXT =
 const TOOL_DELEGATION_NUDGE_TEXT =
   'Do not ask the user to run native tools. You have access to the tools in this environment. Make exactly one native tool call now.'
 
+const TOOL_BUDGET_NUDGE_TEXT =
+  'You have reached the tool-call budget for this turn. Do not call any more tools. Produce your final answer now using only what you already know from earlier tool results.'
+
 const PRIVATE_CONTINUITY_NUDGE_TEXT =
   'SOUL.md and MEMORY.md are existing private identity-vault scaffold files. Do not search workspace folders, read plans/, create files, or overwrite them. If exact private text is needed for a surgical removal or targeted replacement, call read_private_continuity_file with {"file":"MEMORY.md"} or {"file":"SOUL.md"}. If the user wants private continuity changed, call propose_private_continuity_edit. For memory/preferences use {"file":"MEMORY.md","appendToSection":"Durable User Preferences","appendText":"- User preference or memory note."}. For persona use {"file":"SOUL.md","appendToSection":"Persona","appendText":"- Persona or standing behavior note."}.'
 
@@ -164,6 +169,7 @@ export async function* runRuntimeTurn(
   let continuationNudges = 0
   let iterationIndex = 0
   let priorIterationHadTools = false
+  let cumulativeToolUseCount = 0
   const toolEvidenceThisTurn: ToolEvidence[] = []
 
   // eslint-disable-next-line no-constant-condition
@@ -395,6 +401,29 @@ export async function* runRuntimeTurn(
       return
     }
 
+    if (cumulativeToolUseCount + pendingToolUses.length > MAX_TOOL_USES_PER_TURN) {
+      if (continuationNudges < maxContinuationNudges) {
+        continuationNudges += 1
+        yield {
+          type: 'continuation_nudge',
+          attempt: continuationNudges,
+          reason: 'tool_budget',
+        }
+        workingMessages = [
+          ...await rebuildMessages(),
+          { role: 'user', content: TOOL_BUDGET_NUDGE_TEXT },
+        ]
+        continue
+      }
+      yield {
+        type: 'error',
+        message: `tool budget exceeded (${MAX_TOOL_USES_PER_TURN} max per turn); ask again with a narrower request`,
+      }
+      yield doneEvent(false, stopReason)
+      return
+    }
+    cumulativeToolUseCount += pendingToolUses.length
+
     const batch = await runToolBatch(pendingToolUses)
     for (const completed of batch.completedTools) {
       toolEvidenceThisTurn.push({

package/src/storage/rewind.ts

@@ -131,6 +131,26 @@ export async function listRewindEntries(
     .slice(offset, offset + limit)
 }
 
+export async function groupRewindEntriesByTurn(
+  workspaceRoot: string,
+  sessionId: string,
+): Promise<Map<string, RewindEntry[]>> {
+  const normalizedWorkspaceRoot = path.resolve(workspaceRoot)
+  const snapshots = await loadSnapshots()
+  const grouped = new Map<string, RewindEntry[]>()
+  for (const snapshot of snapshots) {
+    if (isIdentityMarkdownSnapshot(snapshot)) continue
+    if (!isSnapshotWithinScope(snapshot, normalizedWorkspaceRoot)) continue
+    if (snapshot.sessionId !== sessionId) continue
+    if (!snapshot.turnId) continue
+    const entry = toEntry(snapshot)
+    const bucket = grouped.get(snapshot.turnId)
+    if (bucket) bucket.push(entry)
+    else grouped.set(snapshot.turnId, [entry])
+  }
+  return grouped
+}
+
 export async function rewindWorkspaceEditsByEntryIds(
   workspaceRoot: string,
   entryIds: string[],

package/src/storage/sessions.ts

@@ -6,6 +6,7 @@ import type { Message } from '../providers/contracts.js'
 import { getCwd } from '../runtime/cwd.js'
 import type { SessionMode } from '../runtime/sessionMode.js'
 import { atomicWriteText } from './atomicWrite.js'
+import { stripFileChangeResultDiff } from '../tools/fileDiff.js'
 import {
   isUserCorrectionOfToolState,
   looksLikeToolStateClaim,
@@ -282,7 +283,7 @@ export function sessionMessagesToProviderMessages(
       content: [{
         type: 'tool_result',
         toolUseId: message.toolUseId,
-        content: message.content,
+        content: stripFileChangeResultDiff(message.content),
         isError: message.isError,
       }],
     })

package/src/tools/bashSafety.ts

@@ -98,16 +98,16 @@ export function assessBashCommand(command: string): BashSafetyAssessment {
   const triggeredChecks = RISKY_PATTERN_CHECKS.filter(check => check.pattern.test(command)).map(check => check.message)
 
   const warning = triggeredChecks.length > 0
-    ? `warning: ${triggeredChecks[0]}. reusable approval is limited for this command.`
+    ? `Warning: ${sentenceCase(triggeredChecks[0] ?? 'command is risky')}. Reusable approval is limited for this command.`
     : highRisk
-      ? `warning: ${firstToken} is a high-impact command. reusable approval is limited for this command.`
+      ? `Warning: ${sentenceCase(firstToken ?? '')} is a high-impact command. Reusable approval is limited for this command.`
       : undefined
 
   return {
     warning,
     canPersistExact: triggeredChecks.length === 0 && !nonPersistable,
     canPersistPrefix: triggeredChecks.length === 0 && !highRisk && Boolean(firstToken),
-    commandPrefix: firstToken,
+    commandPrefix: firstToken ?? '',
   }
 }
 
@@ -180,3 +180,7 @@ function normalizeCommandToken(token: string): string {
     .toLowerCase()
     .replace(/[^a-z0-9_.:-]/g, '') ?? ''
 }
+
+function sentenceCase(value: string): string {
+  return value ? value[0]!.toUpperCase() + value.slice(1) : value
+}

package/src/tools/bashTool.ts

@@ -39,7 +39,7 @@ export const bashTool: Tool<typeof schema> = {
       command: input.command,
       commandPrefix: safety.commandPrefix,
       cwd,
-      title: 'allow shell command?',
+      title: 'Allow shell command?',
       subtitle: `${input.command}\n${cwd}`,
       warning: safety.warning,
       canPersistExact: safety.canPersistExact,

package/src/tools/contracts.ts

@@ -23,6 +23,7 @@ export type PermissionRequest =
       subtitle: string
       before: string
       after: string
+      diff: string
       changeSummary: string
     }
   | {
@@ -34,6 +35,7 @@ export type PermissionRequest =
       subtitle: string
       before: string
       after: string
+      diff: string
       changeSummary: string
     }
   | {
@@ -68,6 +70,7 @@ export type PermissionRequest =
       subtitle: string
       before: string
       after: string
+      diff: string
       changeSummary: string
     }
   | {

package/src/tools/deleteFileTool.ts

@@ -3,6 +3,7 @@ import path from 'node:path'
 import { z } from 'zod'
 import { recordRewindSnapshot } from '../storage/rewind.js'
 import type { Tool } from './contracts.js'
+import { formatFileChangeResult, renderUnifiedFileDiff } from './fileDiff.js'
 import { resolveWorkspacePath } from './readTool.js'
 
 const schema = z.object({
@@ -35,6 +36,7 @@ export const deleteFileTool: Tool<typeof schema> = {
       subtitle: prepared.fullPath,
       before: preview(prepared.before),
       after: '(deleted)',
+      diff: renderUnifiedFileDiff({ filePath: prepared.relativePath, before: prepared.before, after: '' }),
       changeSummary: `delete ${prepared.relativePath}`,
     }
   },
@@ -58,9 +60,12 @@ export const deleteFileTool: Tool<typeof schema> = {
     return {
       ok: true,
       summary: `deleted ${prepared.relativePath}`,
-      content: rewindWarning
-        ? `deleted ${prepared.fullPath}\nwarning: ${rewindWarning}`
-        : `deleted ${prepared.fullPath}`,
+      content: formatFileChangeResult(
+        rewindWarning
+          ? `deleted ${prepared.fullPath}\nwarning: ${rewindWarning}`
+          : `deleted ${prepared.fullPath}`,
+        renderUnifiedFileDiff({ filePath: prepared.relativePath, before: prepared.before, after: '' }),
+      ),
     }
   },
 }

package/src/tools/editTool.ts

@@ -5,6 +5,7 @@ import { recordRewindSnapshot } from '../storage/rewind.js'
 import type { EthagentConfig } from '../storage/config.js'
 import type { Tool } from './contracts.js'
 import { applyRequestedEdit } from './editUtils.js'
+import { formatFileChangeResult, renderUnifiedFileDiff } from './fileDiff.js'
 import { resolveWorkspacePath } from './readTool.js'
 
 const schema = z.object({
@@ -44,15 +45,16 @@ export const editTool: Tool<typeof schema> = {
       subtitle: fullPath,
       before: applied.previewBefore,
       after: applied.previewAfter,
+      diff: renderUnifiedFileDiff({ filePath: relativePath, before: applied.before, after: applied.after }),
       changeSummary: applied.summary,
     }
   },
   async execute(input, context) {
-    const { fullPath, applied, existedBefore, before } = await prepareEdit(input, context)
+    const { fullPath, relativePath, applied, existedBefore, before } = await prepareEdit(input, context)
     const rewindWarning = await tryRecordRewindSnapshot({
       workspaceRoot: context.workspaceRoot,
       filePath: fullPath,
-      relativePath: path.relative(context.workspaceRoot, fullPath) || path.basename(fullPath),
+      relativePath,
       existedBefore,
       previousContent: before,
       changeSummary: applied.summary,
@@ -68,9 +70,12 @@ export const editTool: Tool<typeof schema> = {
     return {
       ok: true,
       summary: applied.summary,
-      content: rewindWarning
-        ? `updated ${fullPath}\nwarning: ${rewindWarning}`
-        : `updated ${fullPath}`,
+      content: formatFileChangeResult(
+        rewindWarning
+          ? `updated ${fullPath}\nwarning: ${rewindWarning}`
+          : `updated ${fullPath}`,
+        renderUnifiedFileDiff({ filePath: relativePath, before: applied.before, after: applied.after }),
+      ),
     }
   },
 }